Fix output_dir and package_suffix env variables

jhmgoossens · Apr 7, 2024 · 7366121 · 7366121
1 parent 5fd4ebe
commit 7366121
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/.github/workflows/windows-msvs-ci.yml b/.github/workflows/windows-msvs-ci.yml
@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         include: [
-          # Only os: windows-2022 has MSVS v17 (2022) installed, which is required.
+          # Only os: windows-2022 has Visual Studio 2022 (v17) installed with toolset v143, which is required.
           { os: windows-2022, configuration: "Release", platform: "x86" },
           { os: windows-2022, configuration: "Release", platform: "x64" },
           { os: windows-2022, configuration: "Debug", platform: "x64" },
@@ -31,15 +31,15 @@ jobs:
       - name: Set up environment variables
         shell: cmd
         run: |
-          if "${{ matrix.platform }}"=="x64" echo "output_dir=x64\${{ matrix.configuration }}" >> %GITHUB_ENV%
-          if "${{ matrix.platform }}"=="x86" echo "output_dir=${{ matrix.configuration }}" >> %GITHUB_ENV%
-          echo "package_suffix=${{ matrix.os}}-msvs-v17-{{ matrix.configuration }}-{{ matrix.platform }}" >> %GITHUB_ENV%
+          if "${{ matrix.platform }}"=="x64" echo output_dir=x64\${{ matrix.configuration }} >> %GITHUB_ENV%
+          if "${{ matrix.platform }}"=="x86" echo output_dir=${{ matrix.configuration }} >> %GITHUB_ENV%
+          echo package_suffix=${{ matrix.os}}-msvs-v17-{{ matrix.configuration }}-{{ matrix.platform }} >> %GITHUB_ENV%
       - name: Check environment variables
         shell: cmd
         run: |
-          echo "Output directory - '${{ env.output_dir }}'"
-          echo "Package suffix - '${{ env.package_suffix }}'"
-          if "${{ env.output_dir }}"=="" echo "ERROR - No output_dir set, possibly unsupported platform '${{ matrix.platform }}'. Expecting x64 or x86." && exit 1
+          echo Output directory - '${{ env.output_dir }}'
+          echo Package suffix - '${{ env.package_suffix }}'
+          if "${{ env.output_dir }}"=="" echo ERROR - No output_dir set, possibly unsupported platform '${{ matrix.platform }}'. Expecting x64 or x86. && exit 1
       - name: Checkout source
         uses: actions/checkout@v4
         with: