Skip to content

Commit

Permalink
[CI] bis : have fun with windows env variables
Browse files Browse the repository at this point in the history
remove extra {}

revert back to windows 2019
  • Loading branch information
jbtrystram committed Nov 15, 2022
1 parent 76a29a0 commit 4bf95e1
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
[ "$VERSION" == "main" ] && VERSION=latest # main branch
[ "$VERSION" == "merge" ] && VERSION=latest # PR
echo VERSION=$VERSION
echo "version={$VERSION}" >> $GITHUB_OUTPUT
echo "version=$VERSION" >> $GITHUB_OUTPUT
echo "VERSION=$VERSION" >> $GITHUB_ENV
- name: Dump state
run: |
Expand Down Expand Up @@ -73,15 +73,15 @@ jobs:

strategy:
matrix:
os: [ubuntu-22.04, macos-12, windows-2022]
os: [ubuntu-22.04, macos-12, windows-2019]
include:
- os: ubuntu-22.04
suffix: "linux-amd64"
pkg: "tar.gz"
- os: macos-12
suffix: "macos-amd64"
pkg: "tar.gz"
- os: windows-2022
- os: windows-2019
suffix: "windows-amd64"
exe: ".exe"
pkg: "zip"
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
run: .github/scripts/package_release.sh "${{matrix.suffix}}" "${{matrix.exe}}" "${{matrix.pkg}}" "${VERSION}"

- name: Build Windows Installer
if: ${{ matrix.os == 'windows-2022' }}
if: ${{ matrix.os == 'windows-2019' }}
shell: cmd
#
# In the following command we add '.0' to the version, as MSI expects a version in the format 'a.b.c.d'.
Expand All @@ -130,7 +130,6 @@ jobs:
nuget install WiX -version 3.11.2
set VERSION=%VERSION:latest=0.0.0%
set VERSION=%VERSION%.0
echo %VERSION%
D:\a\drg\drg\WiX.3.11.2\tools\candle -v -dVersion=%VERSION% -arch x64 dist\wix\drg.wxs
D:\a\drg\drg\WiX.3.11.2\tools\light drg.wixobj -o drg-%VERSION%-${{matrix.suffix}}.msi
Expand All @@ -143,7 +142,7 @@ jobs:
drg-*.zip
- uses: actions/upload-artifact@v2
if: ${{ matrix.os == 'windows-2022' }}
if: ${{ matrix.os == 'windows-2019' }}
with:
name: installer-${{ matrix.os }}
if-no-files-found: error
Expand Down

0 comments on commit 4bf95e1

Please sign in to comment.