Merge pull request #5087 from maron2000/master

Fix Windows installer release version build procedure
joncampbell123 · Jul 2, 2024 · 1d3c1b6 · 1d3c1b6
2 parents 8afc213 + bc4ed81
commit 1d3c1b6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/vsbuild_xp.yml b/.github/workflows/vsbuild_xp.yml
@@ -244,6 +244,12 @@ jobs:
         with:
           path: ${{ github.workspace }}/mingw-bin
           key: mingw-xp-bin-r-${{ github.sha }}
+      - name: Update release version
+        if: startsWith(github.ref, 'refs/tags/') 
+        shell: bash
+        run: |
+          DOSBOX_X_RELEASE=`gh release list -L1 | grep -o "....-..-.." | head -n 1 | sed -e "s/-/./g"`
+          sed -i "s/^#define MyAppVersion.*/#define MyAppVersion \"$DOSBOX_X_RELEASE\"/" contrib/windows/installer/DOSBox-X-setupXP.iss
       - name: Prepare files
         shell: bash
         run: |

diff --git a/.github/workflows/windows-installers.yml b/.github/workflows/windows-installers.yml
@@ -219,7 +219,7 @@ jobs:
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
         uses: actions/cache/save@v4
         with:
-          path: ${{ github.workspace }}/vs-bin
+          path: ${{ github.workspace }}/mingw-x86-bin
           key: mingw-x86-bin-r-${{ github.sha }}
   MinGW64_CI_build:
     permissions:
@@ -278,7 +278,7 @@ jobs:
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
         uses: actions/cache/save@v4
         with:
-          path: ${{ github.workspace }}/vs-bin
+          path: ${{ github.workspace }}/mingw-x64-bin
           key: mingw-x64-bin-r-${{ github.sha }}
   Build_Windows_Installer:
     permissions: