Update workflows to remove unintended double dashes

Ruben2776 · Feb 13, 2025 · ad75ee7 · ad75ee7
1 parent bd2a832
commit ad75ee7
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 45 deletions.
diff --git a/.github/workflows/BuildWin32.yml b/.github/workflows/BuildWin32.yml
@@ -1,4 +1,4 @@
-name: Build PicView Avalonia on Windows
+name: Build PicView Win32
 
 on:
   push:
@@ -27,73 +27,61 @@ jobs:
       - name: Get version from Directory.Build.props
         id: get-version
         run: pwsh -File "${{ github.workspace }}/Build/Get-VersionInfo.ps1"
-
+      
       # Step 4 (x64): Publish x64 version
       - name: Publish x64 version
         run: |
-          pwsh -File "${{ github.workspace }}\Build\Build Avalonia.Win32.ps1" -Platform "x64" -outputPath "${{ github.workspace }}\Build\PicView-v${{ steps.get-version.outputs.version }}-win-x64"
+          pwsh -File "${{ github.workspace }}\Build\Build Avalonia.Win32.ps1" -Platform "x64" -outputPath "${{ github.workspace }}\Build\PicView-v${{steps.get-version.outputs.version}}-win-x64"
         shell: pwsh
 
-      # Step 5 (x64): Rename files with double hyphens to single hyphen
-      - name: Rename files with double hyphens (x64)
-        run: |
-          Get-ChildItem -Path "${{ github.workspace }}\Build\PicView-v${{ steps.get-version.outputs.version }}-win-x64" -Recurse -Filter "*--*" | Rename-Item -NewName { $_.Name -replace '--', '-' }
-        shell: pwsh
-
-      # Step 6 (x64): Upload the x64 zip file as an artifact
+      # Step 5 (x64): Upload the x64 zip file as an artifact
       - name: Upload the x64 artifact
         uses: actions/upload-artifact@v4
         with:
-          name: PicView-v${{ steps.get-version.outputs.version }}-win-x64
-          path: ${{ github.workspace }}/Build/PicView-v${{ steps.get-version.outputs.version }}-win-x64/
+          name: PicView-v${{steps.get-version.outputs.version}}-win-x64
+          path: ${{ github.workspace }}/Build/PicView-v${{steps.get-version.outputs.version}}-win-x64/
           retention-days: 14
 
-      # Step 7 (x64): Compile .ISS to .EXE Installer for x64
+      # Step 6 (x64): Compile .ISS to .EXE Installer for x64
       - name: Compile .ISS to .EXE Installer (x64)
         uses: Minionguyjpro/[email protected]
         with:
           path: .\Build\install.iss
-          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
+          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
 
-      # Step 8 (x64): Upload the Inno Setup Installer for x64 as an artifact
+      # Step 7 (x64): Upload the Inno Setup Installer for x64 as an artifact
       - name: Upload Inno Setup Installer (x64)
         uses: actions/upload-artifact@v4
         with:
-          name: PicView-${{ steps.get-version.outputs.version }}-installer-x64
-          path: ${{ github.workspace }}\Build\install\Setup-PicView-v${{ steps.get-version.outputs.version }}-win-x64.exe
+          name: PicView-${{steps.get-version.outputs.version}}-installer-x64
+          path: ${{ github.workspace }}\Build\install\Setup-PicView-v${{steps.get-version.outputs.version}}-win-x64.exe
           retention-days: 14
 
-      # Step 9 (arm64): Publish arm64 version
+      # Step 8 (arm64): Publish arm64 version
       - name: Publish arm64 version
         run: |
-          pwsh -File "${{ github.workspace }}\Build\Build Avalonia.Win32.ps1" -Platform "arm64" -outputPath "${{ github.workspace }}\Build\PicView-v${{ steps.get-version.outputs.version }}-win-arm64"
+          pwsh -File "${{ github.workspace }}\Build\Build Avalonia.Win32.ps1" -Platform "arm64" -outputPath "${{ github.workspace }}\Build\PicView-v${{steps.get-version.outputs.version}}-win-arm64"
         shell: pwsh
 
-      # Step 10 (arm64): Rename files with double hyphens to single hyphen
-      - name: Rename files with double hyphens (arm64)
-        run: |
-          Get-ChildItem -Path "${{ github.workspace }}\Build\PicView-v${{ steps.get-version.outputs.version }}-win-arm64" -Recurse -Filter "*--*" | Rename-Item -NewName { $_.Name -replace '--', '-' }
-        shell: pwsh
-
-      # Step 11 (arm64): Upload the arm64 zip file as an artifact
+      # Step 9 (arm64): Upload the arm64 zip file as an artifact
       - name: Upload the arm64 artifact
         uses: actions/upload-artifact@v4
         with:
-          name: PicView-v${{ steps.get-version.outputs.version }}-win-arm64
-          path: ${{ github.workspace }}/Build/PicView-v${{ steps.get-version.outputs.version }}-win-arm64/
+          name: PicView-v${{steps.get-version.outputs.version}}-win-arm64
+          path: ${{ github.workspace }}/Build/PicView-v${{steps.get-version.outputs.version}}-win-arm64/
           retention-days: 14
 
-      # Step 12 (arm64): Compile .ISS to .EXE Installer for arm64
+      # Step 10 (arm64): Compile .ISS to .EXE Installer for arm64
       - name: Compile .ISS to .EXE Installer (arm64)
         uses: Minionguyjpro/[email protected]
         with:
           path: .\Build\install.iss
-          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
+          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
 
-      # Step 13 (arm64): Upload the Inno Setup Installer for arm64 as an artifact
+      # Step 11 (arm64): Upload the Inno Setup Installer for arm64 as an artifact
       - name: Upload Inno Setup Installer (arm64)
         uses: actions/upload-artifact@v4
         with:
-          name: PicView-${{ steps.get-version.outputs.version }}-installer-arm64
-          path: ${{ github.workspace }}\Build\install\Setup-PicView-v${{ steps.get-version.outputs.version }}-win-arm64.exe
-          retention-days: 14
+          name: PicView-${{steps.get-version.outputs.version}}-installer-arm64
+          path: ${{ github.workspace }}\Build\install\Setup-PicView-v${{steps.get-version.outputs.version}}-win-arm64.exe
+          retention-days: 14
diff --git a/.github/workflows/ReleaseSignWindows.yaml b/.github/workflows/ReleaseSignWindows.yaml
@@ -1,4 +1,4 @@
-name: Release Signing on Windows
+name: Release signing on Windows
 run-name: workflow release signing with SignPath
 
 on: workflow_dispatch
@@ -18,6 +18,7 @@ jobs:
         with:
           dotnet-version: '9.x'
 
+
       # Step 3: Get version from Directory.Build.props using PowerShell
       - name: Get version from Directory.Build.props
         id: get-version
@@ -34,28 +35,24 @@ jobs:
         uses: Minionguyjpro/[email protected]
         with:
           path: .\Build\install.iss
-          options: /O+ /DMyAppVersion=${{steps.get-version.outputs.file-version}} /DMyAppOutputDir=${{ github.workspace }}\Build\install /DMyFileSource=${{ github.workspace }}\Build\PicView-v${{steps.[...]
+          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
 
       # Step 6 (arm64): Publish arm64 version
       - name: Publish arm64 version
         run: |
           pwsh -File "${{ github.workspace }}\Build\Build Avalonia.Win32.ps1" -Platform "arm64" -outputPath "${{ github.workspace }}\Build\PicView-v${{steps.get-version.outputs.version}}-win-arm64"
         shell: pwsh
 
+
       # Step 7 (arm64): Compile .ISS to .EXE Installer for arm64
       - name: Compile .ISS to .EXE Installer (arm64)
         uses: Minionguyjpro/[email protected]
         with:
           path: .\Build\install.iss
-          options: /O+ /DMyAppVersion=${{steps.get-version.outputs.file-version}} /DMyAppOutputDir=${{ github.workspace }}\Build\install /DMyFileSource=${{ github.workspace }}\Build\PicView-v${{steps.[...]
+          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
 
-      # Step 8: Rename files with double hyphens to single hyphen
-      - name: Rename files with double hyphens
-        run: |
-          Get-ChildItem -Path "${{ github.workspace }}\Build" -Recurse -Filter "*--*" | Rename-Item -NewName { $_.Name -replace '--', '-' }
-        shell: pwsh
 
-      # Step 9: Upload unsigned artifact
+      # Step 8: Upload unsigned artifact
       - name: upload-unsigned-artifact
         id: upload-unsigned-artifact
         uses: actions/upload-artifact@v4
@@ -69,7 +66,7 @@ jobs:
             ${{ github.workspace }}\Build\install\Setup-PicView-v${{steps.get-version.outputs.version}}-win-arm64.exe
           retention-days: 1
 
-      # Step 10: Sign the binaries
+      # Step 9: Sign the binaries
       - name: Sign files
         uses: signpath/github-action-submit-signing-request@v1
         with:
@@ -81,7 +78,7 @@ jobs:
           wait-for-completion: true
           output-artifact-directory: 'PicView-${{steps.get-version.outputs.version}}-signed'
 
-      # Step 11: Upload signed binaries
+      # Step 10: Upload signed binaries
       - name: upload-signed-artifact
         uses: actions/upload-artifact@v4
         with:

diff --git a/Build/Build Avalonia.Win32.ps1 b/Build/Build Avalonia.Win32.ps1
@@ -47,4 +47,7 @@ if (Test-Path $pdbPath) {
 #Remove uninstended space
 Rename-Item -path $outputPath -NewName $outputPath.Replace(" ","")
 
+#remove uninstended double dashes
+Rename-Item -path $outputPath -NewName $outputPath.Replace("--","-")
+