Skip to content

Commit ad75ee7

Browse files
Ruben2776Ruben2776
committed
Update workflows to remove unintended double dashes
1 parent bd2a832 commit ad75ee7

File tree

3 files changed

+33
-45
lines changed

3 files changed

+33
-45
lines changed

‎.github/workflows/BuildWin32.yml

Lines changed: 22 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build PicView Avalonia on Windows
1+
name: Build PicView Win32
22

33
on:
44
push:
@@ -27,73 +27,61 @@ jobs:
2727
- name: Get version from Directory.Build.props
2828
id: get-version
2929
run: pwsh -File "${{ github.workspace }}/Build/Get-VersionInfo.ps1"
30-
30+
3131
# Step 4 (x64): Publish x64 version
3232
- name: Publish x64 version
3333
run: |
34-
pwsh -File "${{ github.workspace }}\Build\Build Avalonia.Win32.ps1" -Platform "x64" -outputPath "${{ github.workspace }}\Build\PicView-v${{ steps.get-version.outputs.version }}-win-x64"
34+
pwsh -File "${{ github.workspace }}\Build\Build Avalonia.Win32.ps1" -Platform "x64" -outputPath "${{ github.workspace }}\Build\PicView-v${{steps.get-version.outputs.version}}-win-x64"
3535
shell: pwsh
3636

37-
# Step 5 (x64): Rename files with double hyphens to single hyphen
38-
- name: Rename files with double hyphens (x64)
39-
run: |
40-
Get-ChildItem -Path "${{ github.workspace }}\Build\PicView-v${{ steps.get-version.outputs.version }}-win-x64" -Recurse -Filter "*--*" | Rename-Item -NewName { $_.Name -replace '--', '-' }
41-
shell: pwsh
42-
43-
# Step 6 (x64): Upload the x64 zip file as an artifact
37+
# Step 5 (x64): Upload the x64 zip file as an artifact
4438
- name: Upload the x64 artifact
4539
uses: actions/upload-artifact@v4
4640
with:
47-
name: PicView-v${{ steps.get-version.outputs.version }}-win-x64
48-
path: ${{ github.workspace }}/Build/PicView-v${{ steps.get-version.outputs.version }}-win-x64/
41+
name: PicView-v${{steps.get-version.outputs.version}}-win-x64
42+
path: ${{ github.workspace }}/Build/PicView-v${{steps.get-version.outputs.version}}-win-x64/
4943
retention-days: 14
5044

51-
# Step 7 (x64): Compile .ISS to .EXE Installer for x64
45+
# Step 6 (x64): Compile .ISS to .EXE Installer for x64
5246
- name: Compile .ISS to .EXE Installer (x64)
5347
uses: Minionguyjpro/[email protected]
5448
with:
5549
path: .\Build\install.iss
56-
options: /O+ /DMyAppVersion=${{ steps.get-version.outputs.file-version }} /DMyAppOutputDir=${{ github.workspace }}\Build\install /DMyFileSource=${{ github.workspace }}\Build\PicView-v${{ steps.get-version.outputs.version }}-win-x64
50+
options: /O+ /DMyAppVersion=${{steps.get-version.outputs.file-version}} /DMyAppOutputDir=${{ github.workspace }}\Build\install /DMyFileSource=${{ github.workspace }}\Build\PicView-v${{steps.get-version.outputs.version}}-win-x64 /DAppIcon=${{ github.workspace }}\src\PicView.Avalonia.Win32\icon.ico /DLicenseFile=${{ github.workspace }}\src\PicView.Core\Licenses\LICENSE.txt /DMyAppOutputName=Setup-PicView-v${{steps.get-version.outputs.version}}-win-x64
5751

58-
# Step 8 (x64): Upload the Inno Setup Installer for x64 as an artifact
52+
# Step 7 (x64): Upload the Inno Setup Installer for x64 as an artifact
5953
- name: Upload Inno Setup Installer (x64)
6054
uses: actions/upload-artifact@v4
6155
with:
62-
name: PicView-${{ steps.get-version.outputs.version }}-installer-x64
63-
path: ${{ github.workspace }}\Build\install\Setup-PicView-v${{ steps.get-version.outputs.version }}-win-x64.exe
56+
name: PicView-${{steps.get-version.outputs.version}}-installer-x64
57+
path: ${{ github.workspace }}\Build\install\Setup-PicView-v${{steps.get-version.outputs.version}}-win-x64.exe
6458
retention-days: 14
6559

66-
# Step 9 (arm64): Publish arm64 version
60+
# Step 8 (arm64): Publish arm64 version
6761
- name: Publish arm64 version
6862
run: |
69-
pwsh -File "${{ github.workspace }}\Build\Build Avalonia.Win32.ps1" -Platform "arm64" -outputPath "${{ github.workspace }}\Build\PicView-v${{ steps.get-version.outputs.version }}-win-arm64"
63+
pwsh -File "${{ github.workspace }}\Build\Build Avalonia.Win32.ps1" -Platform "arm64" -outputPath "${{ github.workspace }}\Build\PicView-v${{steps.get-version.outputs.version}}-win-arm64"
7064
shell: pwsh
7165

72-
# Step 10 (arm64): Rename files with double hyphens to single hyphen
73-
- name: Rename files with double hyphens (arm64)
74-
run: |
75-
Get-ChildItem -Path "${{ github.workspace }}\Build\PicView-v${{ steps.get-version.outputs.version }}-win-arm64" -Recurse -Filter "*--*" | Rename-Item -NewName { $_.Name -replace '--', '-' }
76-
shell: pwsh
77-
78-
# Step 11 (arm64): Upload the arm64 zip file as an artifact
66+
# Step 9 (arm64): Upload the arm64 zip file as an artifact
7967
- name: Upload the arm64 artifact
8068
uses: actions/upload-artifact@v4
8169
with:
82-
name: PicView-v${{ steps.get-version.outputs.version }}-win-arm64
83-
path: ${{ github.workspace }}/Build/PicView-v${{ steps.get-version.outputs.version }}-win-arm64/
70+
name: PicView-v${{steps.get-version.outputs.version}}-win-arm64
71+
path: ${{ github.workspace }}/Build/PicView-v${{steps.get-version.outputs.version}}-win-arm64/
8472
retention-days: 14
8573

86-
# Step 12 (arm64): Compile .ISS to .EXE Installer for arm64
74+
# Step 10 (arm64): Compile .ISS to .EXE Installer for arm64
8775
- name: Compile .ISS to .EXE Installer (arm64)
8876
uses: Minionguyjpro/[email protected]
8977
with:
9078
path: .\Build\install.iss
91-
options: /O+ /DMyAppVersion=${{ steps.get-version.outputs.file-version }} /DMyAppOutputDir=${{ github.workspace }}\Build\install /DMyFileSource=${{ github.workspace }}\Build\PicView-v${{ steps.get-version.outputs.version }}-win-arm64
79+
options: /O+ /DMyAppVersion=${{steps.get-version.outputs.file-version}} /DMyAppOutputDir=${{ github.workspace }}\Build\install /DMyFileSource=${{ github.workspace }}\Build\PicView-v${{steps.get-version.outputs.version}}-win-arm64 /DAppIcon=${{ github.workspace }}\src\PicView.Avalonia.Win32\icon.ico /DLicenseFile=${{ github.workspace }}\src\PicView.Core\Licenses\LICENSE.txt /DMyAppOutputName=Setup-PicView-v${{steps.get-version.outputs.version}}-win-arm64
9280

93-
# Step 13 (arm64): Upload the Inno Setup Installer for arm64 as an artifact
81+
# Step 11 (arm64): Upload the Inno Setup Installer for arm64 as an artifact
9482
- name: Upload Inno Setup Installer (arm64)
9583
uses: actions/upload-artifact@v4
9684
with:
97-
name: PicView-${{ steps.get-version.outputs.version }}-installer-arm64
98-
path: ${{ github.workspace }}\Build\install\Setup-PicView-v${{ steps.get-version.outputs.version }}-win-arm64.exe
99-
retention-days: 14
85+
name: PicView-${{steps.get-version.outputs.version}}-installer-arm64
86+
path: ${{ github.workspace }}\Build\install\Setup-PicView-v${{steps.get-version.outputs.version}}-win-arm64.exe
87+
retention-days: 14

‎.github/workflows/ReleaseSignWindows.yaml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Release Signing on Windows
1+
name: Release signing on Windows
22
run-name: workflow release signing with SignPath
33

44
on: workflow_dispatch
@@ -18,6 +18,7 @@ jobs:
1818
with:
1919
dotnet-version: '9.x'
2020

21+
2122
# Step 3: Get version from Directory.Build.props using PowerShell
2223
- name: Get version from Directory.Build.props
2324
id: get-version
@@ -34,28 +35,24 @@ jobs:
3435
uses: Minionguyjpro/[email protected]
3536
with:
3637
path: .\Build\install.iss
37-
options: /O+ /DMyAppVersion=${{steps.get-version.outputs.file-version}} /DMyAppOutputDir=${{ github.workspace }}\Build\install /DMyFileSource=${{ github.workspace }}\Build\PicView-v${{steps.[...]
38+
options: /O+ /DMyAppVersion=${{steps.get-version.outputs.file-version}} /DMyAppOutputDir=${{ github.workspace }}\Build\install /DMyFileSource=${{ github.workspace }}\Build\PicView-v${{steps.get-version.outputs.version}}-win-x64 /DAppIcon=${{ github.workspace }}\src\PicView.Avalonia.Win32\icon.ico /DLicenseFile=${{ github.workspace }}\src\PicView.Core\Licenses\LICENSE.txt /DMyAppOutputName=Setup-PicView-v${{steps.get-version.outputs.version}}-win-x64
3839

3940
# Step 6 (arm64): Publish arm64 version
4041
- name: Publish arm64 version
4142
run: |
4243
pwsh -File "${{ github.workspace }}\Build\Build Avalonia.Win32.ps1" -Platform "arm64" -outputPath "${{ github.workspace }}\Build\PicView-v${{steps.get-version.outputs.version}}-win-arm64"
4344
shell: pwsh
4445

46+
4547
# Step 7 (arm64): Compile .ISS to .EXE Installer for arm64
4648
- name: Compile .ISS to .EXE Installer (arm64)
4749
uses: Minionguyjpro/[email protected]
4850
with:
4951
path: .\Build\install.iss
50-
options: /O+ /DMyAppVersion=${{steps.get-version.outputs.file-version}} /DMyAppOutputDir=${{ github.workspace }}\Build\install /DMyFileSource=${{ github.workspace }}\Build\PicView-v${{steps.[...]
52+
options: /O+ /DMyAppVersion=${{steps.get-version.outputs.file-version}} /DMyAppOutputDir=${{ github.workspace }}\Build\install /DMyFileSource=${{ github.workspace }}\Build\PicView-v${{steps.get-version.outputs.version}}-win-arm64 /DAppIcon=${{ github.workspace }}\src\PicView.Avalonia.Win32\icon.ico /DLicenseFile=${{ github.workspace }}\src\PicView.Core\Licenses\LICENSE.txt /DMyAppOutputName=Setup-PicView-v${{steps.get-version.outputs.version}}-win-arm64
5153

52-
# Step 8: Rename files with double hyphens to single hyphen
53-
- name: Rename files with double hyphens
54-
run: |
55-
Get-ChildItem -Path "${{ github.workspace }}\Build" -Recurse -Filter "*--*" | Rename-Item -NewName { $_.Name -replace '--', '-' }
56-
shell: pwsh
5754

58-
# Step 9: Upload unsigned artifact
55+
# Step 8: Upload unsigned artifact
5956
- name: upload-unsigned-artifact
6057
id: upload-unsigned-artifact
6158
uses: actions/upload-artifact@v4
@@ -69,7 +66,7 @@ jobs:
6966
${{ github.workspace }}\Build\install\Setup-PicView-v${{steps.get-version.outputs.version}}-win-arm64.exe
7067
retention-days: 1
7168

72-
# Step 10: Sign the binaries
69+
# Step 9: Sign the binaries
7370
- name: Sign files
7471
uses: signpath/github-action-submit-signing-request@v1
7572
with:
@@ -81,7 +78,7 @@ jobs:
8178
wait-for-completion: true
8279
output-artifact-directory: 'PicView-${{steps.get-version.outputs.version}}-signed'
8380

84-
# Step 11: Upload signed binaries
81+
# Step 10: Upload signed binaries
8582
- name: upload-signed-artifact
8683
uses: actions/upload-artifact@v4
8784
with:

‎Build/Build Avalonia.Win32.ps1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,7 @@ if (Test-Path $pdbPath) {
4747
#Remove uninstended space
4848
Rename-Item -path $outputPath -NewName $outputPath.Replace(" ","")
4949

50+
#remove uninstended double dashes
51+
Rename-Item -path $outputPath -NewName $outputPath.Replace("--","-")
52+
5053

0 commit comments

Comments
 (0)