Skip to content

Commit

Permalink
ci: set variables after toolset is set by php-sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
omars44 committed Nov 30, 2023
1 parent 2cb0c2c commit fd8896a
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ jobs:
- name: Checkout the code
uses: actions/checkout@v2

- name: Enable Developer Command Prompt
uses: ilammy/msvc-dev-cmd@v1
with:
arch: ${{matrix.arch}}
toolset: ${{steps.setup-php.outputs.toolset}}

- name: Setup PHP
id: setup-php
uses: omars44/setup-php-sdk@vc14-minor-ver-bug
Expand All @@ -32,7 +26,12 @@ jobs:
arch: ${{matrix.arch}}
ts: ${{matrix.ts}}
deps: 'libxml2,libcurl,libiconv,libssh2,openssl,nghttp2'


- name: Enable Developer Command Prompt
uses: ilammy/msvc-dev-cmd@v1
with:
arch: ${{matrix.arch}}
toolset: ${{steps.setup-php.outputs.toolset}}
# install extra package deps (zlib) (static: _a.lib, and dynamic .lib)
- name: cache vcpkg libraries
id: cache-vcpkg
Expand All @@ -59,7 +58,7 @@ jobs:
phpize
- name: configure
run: |
configure --with-verbosity=2 --enable-solr --with-vcrt-only --with-php-build=.\..\deps --with-prefix=${{steps.setup-php.outputs.prefix}}
configure --with-verbosity=2 --enable-solr --with-php-build=.\..\deps --with-prefix=${{steps.setup-php.outputs.prefix}}
- name: extract variables from Makefile (build_dir and dll_file)
shell: powershell
Expand Down

0 comments on commit fd8896a

Please sign in to comment.