Skip to content

Commit 3403a5b

Browse files
committed
Cleanup
1 parent 18722b6 commit 3403a5b

File tree

1 file changed

+24
-59
lines changed

1 file changed

+24
-59
lines changed

.github/workflows/app.yml

Lines changed: 24 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ name: App Build
22

33
on:
44
push:
5-
# tags:
6-
# - '*'
5+
branches:
6+
- main
77

88
env:
99
AppUuid: "FalconNL93.WSLToolbox"
1010
AppName: "WSL Toolbox"
11-
AppDescription: "WSL Toolbox allows you to manage your WSL Distributions through an easy to use interface."
11+
AppDescription: "WSL Toolbox allows you to manage your WSL Distributions through an easy-to-use interface."
1212
AppExecutable: "toolbox.exe"
1313
AppVersion: "1.0.0.0"
1414
AppUrl: "https://github.com/FalconNL93/wsltoolbox"
@@ -17,39 +17,27 @@ env:
1717

1818
jobs:
1919
build:
20+
runs-on: windows-latest
2021
strategy:
2122
matrix:
2223
configuration: [Release]
2324
platform: [x64]
24-
runs-on: windows-latest
2525
env:
2626
Platform: ${{ matrix.platform }}
2727
APPCENTER_KEY: ${{ secrets.APPCENTER_KEY }}
2828

2929
steps:
30-
- name: Checkout
31-
uses: actions/checkout@v3
30+
- name: Checkout Code
31+
uses: actions/checkout@v4
3232
with:
3333
fetch-depth: 0
3434

35-
# - name: Modify AppX version
36-
# shell: pwsh
37-
# run: |
38-
# [xml]$manifest= get-content "WslToolbox.UI\Package.appxmanifest";
39-
# $manifest.Package.Identity.Version = "${{ env.AppVersion }}";
40-
# $manifest.save("WslToolbox.UI\Package.appxmanifest");
41-
#
42-
# - name: Add certificate
43-
# run: |
44-
# $pfxEncoded = [System.Convert]::FromBase64String("${{ secrets.APPX_CERTIFICATE }}")
45-
# [IO.File]::WriteAllBytes("${{ github.workspace }}\cert.pfx", $pfxEncoded)
46-
47-
- name: Setup .NET Core SDK
35+
- name: Setup .NET SDK
4836
uses: actions/setup-dotnet@v3
4937
with:
50-
dotnet-version: 8.0.x
38+
dotnet-version: 9.0.x
5139

52-
- name: Publish
40+
- name: Publish Application
5341
run: |
5442
dotnet publish "WslToolbox.UI\WslToolbox.UI.csproj" `
5543
--nologo `
@@ -65,36 +53,36 @@ jobs:
6553
-r win-${{ env.Platform }} `
6654
-o "${{ github.workspace }}\app\release\${{ env.Platform }}"
6755
68-
- name: Upload binary artifacts
69-
uses: actions/upload-artifact@v4.3.6
56+
- name: Upload Binary Artifacts
57+
uses: actions/upload-artifact@v4
7058
with:
7159
name: wsltoolbox_${{ env.AppVersion }}_${{ env.Platform }}
7260
retention-days: 1
7361
path: ${{ github.workspace }}\app\release\${{ env.Platform }}
7462

75-
- name: Upload MSIX artifacts
76-
uses: actions/upload-artifact@v4.3.6
63+
- name: Upload MSIX Artifacts
64+
uses: actions/upload-artifact@v4
7765
with:
7866
name: wsltoolbox_${{ env.AppVersion }}_${{ env.Platform }}_msix
7967
retention-days: 1
8068
path: ${{ github.workspace }}\app\release\${{ env.Platform }}-msix\WslToolbox.UI_${{ env.AppVersion }}_${{ env.Platform }}_Test
8169

8270
setup:
83-
env:
84-
Platform: "x64"
8571
runs-on: windows-2022
8672
needs: build
73+
env:
74+
Platform: "x64"
8775
steps:
88-
- name: Checkout
89-
uses: actions/checkout@v3
76+
- name: Checkout Code
77+
uses: actions/checkout@v4
9078

91-
- name: Download build data
92-
uses: actions/download-artifact@v4.1.8
79+
- name: Download Build Artifacts
80+
uses: actions/download-artifact@v4
9381
with:
9482
name: wsltoolbox_${{ env.AppVersionCommit }}_${{ env.Platform }}
9583
path: ${{ github.workspace }}\app
9684

97-
- name: InnoSetup
85+
- name: Run InnoSetup
9886
run: |
9987
.\WslToolbox.Setup\build.ps1 `
10088
-AppDirectory "${{ github.workspace }}\app" `
@@ -107,44 +95,21 @@ jobs:
10795
-AppOwner "${{ env.AppOwner }}" `
10896
-SetupOutputFile "wsltoolbox_${{ env.AppVersionCommit }}_${{ env.Platform }}_setup"
10997
110-
- name: Upload Build Artifact
111-
uses: actions/upload-artifact@v4.3.6
98+
- name: Upload Setup Artifact
99+
uses: actions/upload-artifact@v4
112100
with:
113101
name: wsltoolbox_${{ env.AppVersionCommit }}_${{ env.Platform }}_setup
114102
path: WslToolbox.Setup\bin\wsltoolbox_${{ env.AppVersionCommit }}_${{ env.Platform }}_setup.exe
115103
retention-days: 1
116104

117-
# create-release:
118-
# needs: [build,setup]
119-
# runs-on: ubuntu-latest
120-
# permissions:
121-
# contents: write
122-
# steps:
123-
# - uses: actions/[email protected]
124-
# - uses: actions/download-artifact@v4
125-
# - name: Display structure of downloaded files
126-
# run: ls -R
127-
# - name: Release
128-
# id: newrelease
129-
# uses: softprops/action-gh-release@v2
130-
# with:
131-
# files: "wsltoolbox_${{ env.AppVersion }}_x64_setup/wsltoolbox_${{ env.AppVersion }}_x64_setup.exe"
132-
# - name: WinGet Updater
133-
# uses: michidk/winget-updater@latest
134-
# with:
135-
# komac-token: ${{ secrets.KOMAC_TOKEN }}
136-
# identifier: ${{ env.AppUuid }}
137-
# repo: "FalconNL93/WslToolbox"
138-
# url: "${{ fromJSON(steps.newrelease.outputs.assets)[0].browser_download_url }}"
139-
140105
purge:
141106
runs-on: ubuntu-latest
142107
needs: setup
143108
steps:
144-
- name: Delete workflow runs
109+
- name: Delete Workflow Runs
145110
uses: Mattraks/delete-workflow-runs@v2
146111
with:
147112
token: ${{ github.token }}
148113
repository: ${{ github.repository }}
149114
retain_days: 0
150-
keep_minimum_runs: 1
115+
keep_minimum_runs: 1

0 commit comments

Comments
 (0)