Try windows build 20

VirgilSecurity · Apr 27, 2024 · 6ab40e3 · 6ab40e3
1 parent 4249c93
commit 6ab40e3
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/.github/workflows/build-windows-php.yml b/.github/workflows/build-windows-php.yml
@@ -11,16 +11,12 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        php-version: ["8.3.6"]
+        php-version: ["8.3"]
         arch: [x86_64]
         include:
           - arch: x86_64
             arch-short: x64
     name: PHP ${{ matrix.php-version }} build on ${{ matrix.os }} for arch ${{ matrix.arch }}
-    env:
-      TOOLS_DIR: "C:\\tools"
-      PHP_DEVEL_HOME: "C:\\tools\\php-${{ matrix.php-version }}-devel-vs16-${{ matrix.arch-short }}"
-      PHP_DEVEL_URL: "https://windows.php.net/downloads/releases/php-devel-pack-${{ matrix.php-version }}-Win32-vs16-${{ matrix.arch-short }}.zip"
     steps:
       - name: Configure toolchain
         run: |
@@ -41,20 +37,18 @@ jobs:
         run: php -v
       - name: Download PHP development pack
         run: |
-          $php_devel_url = "${{ env.PHP_DEVEL_URL }}"
+          $php_devel_url = "https://windows.php.net/downloads/releases/php-devel-pack-${{ steps.setup-php.outputs.php-version }}-Win32-vs16-${{ matrix.arch-short }}.zip"
           $php_devel_zip = "php-devel.zip"
           Invoke-WebRequest -Uri $php_devel_url -OutFile $php_devel_zip
-          Expand-Archive -Path $php_devel_zip -DestinationPath "${{ env.TOOLS_DIR }}"
+          Expand-Archive -Path $php_devel_zip -DestinationPath "c:\\tools"
           Remove-Item -Path $php_devel_zip
-          ls "${{ env.TOOLS_DIR }}"
-          ls "${{ env.PHP_DEVEL_HOME }}"
       - name: Checkout project
         uses: actions/checkout@v4
       - name: Configure project
         run: >
           cmake -G"NMake Makefiles"
-          -C"configs/php-config.cmake"
-          -DPHP_DEVEL_HOME="${{ env.PHP_DEVEL_HOME }}"
+          -C"configs\\php-config.cmake"
+          -DPHP_DEVEL_HOME="C:\\tools\\php-${{ steps.setup-php.outputs.php-version }}-devel-vs16-${{ matrix.arch-short }}"
           -DVIRGIL_LIB_PYTHIA=OFF
           -DCMAKE_BUILD_TYPE=Release
           -DVIRGIL_PACKAGE_PLATFORM_ARCH="${{ matrix.arch }}"