Skip to content

Commit 6c9cc3e

Browse files
shivammathurshivammathur
committed
Add VS18 workflow support
1 parent e108bb2 commit 6c9cc3e

58 files changed

Lines changed: 166 additions & 91 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/apache.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
arch: [x64, x86]
25-
runs-on: windows-2022
25+
runs-on: ${{ (inputs.php == '8.6' || inputs.php == 'master') && 'windows-2025-vs2026' || 'windows-2022' }}
2626
timeout-minutes: 90
2727
steps:
2828
- name: Checkout winlib-builder
@@ -67,13 +67,19 @@ jobs:
6767
6868
- name: Configure apache/httpd
6969
run: |
70-
cmake -S httpd -B build -G "Visual Studio 17 2022" -A ${{ steps.virtuals.outputs.msarch }} ^
70+
cmake -S httpd -B build -G "Visual Studio ${{steps.virtuals.outputs.vsnum}} ${{steps.virtuals.outputs.vsyear}}" -A ${{ steps.virtuals.outputs.msarch }} ^
7171
-T ${{ steps.virtuals.outputs.msts }} ^
7272
-DCMAKE_SYSTEM_VERSION=${{ steps.virtuals.outputs.winsdk }} ^
73+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 ^
7374
-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\apache-install ^
7475
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake ^
7576
-DAPR_INCLUDE_DIR="${{ steps.deps.outputs.deps_root }}/include" ^
7677
"-DAPR_LIBRARIES=${{ steps.deps.outputs.deps_root }}/lib/libapr-1.lib;${{ steps.deps.outputs.deps_root }}/lib/libaprutil-1.lib" ^
78+
-DO=O ^
79+
-Di=i ^
80+
-DI=I ^
81+
-Da=a ^
82+
-DA=A ^
7783
-DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=${{ steps.httpd_profile.outputs.disable_openssl }} ^
7884
-DPCRE_INCLUDE_DIR="${{ steps.deps.outputs.deps_root }}/include" ^
7985
-DPCRE_LIBRARIES="${{ steps.deps.outputs.deps_root }}/${{ steps.httpd_profile.outputs.pcre_lib_path }}" ^

‎.github/workflows/argon2.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
matrix:
1818
arch: [x64, x86]
19-
runs-on: windows-2022
19+
runs-on: ${{ (inputs.php == '8.6' || inputs.php == 'master') && 'windows-2025-vs2026' || 'windows-2022' }}
2020
steps:
2121
- name: Checkout winlib-builder
2222
uses: actions/checkout@v5

‎.github/workflows/brotli.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
matrix:
1818
arch: [x64, x86]
19-
runs-on: windows-2022
19+
runs-on: ${{ (inputs.php == '8.6' || inputs.php == 'master') && 'windows-2025-vs2026' || 'windows-2022' }}
2020
steps:
2121
- name: Checkout winlib-builder
2222
uses: actions/checkout@v4
@@ -32,7 +32,7 @@ jobs:
3232
id: virtuals
3333
run: powershell winlib-builder/scripts/compute-virtuals -version ${{github.event.inputs.php}} -arch ${{matrix.arch}}
3434
- name: Configure brotli
35-
run: md build && cd build && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} ..\brotli
35+
run: md build && cd build && cmake -G "Visual Studio ${{steps.virtuals.outputs.vsnum}} ${{steps.virtuals.outputs.vsyear}}" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} ..\brotli
3636
- name: Build brotli
3737
run: cd build && cmake --build . --config RelWithDebInfo
3838
- name: Install brotli

‎.github/workflows/curl.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
matrix:
2828
arch: [x64, x86]
29-
runs-on: windows-2022
29+
runs-on: ${{ (inputs.php == '8.6' || inputs.php == 'master') && 'windows-2025-vs2026' || 'windows-2022' }}
3030
steps:
3131
- name: Checkout winlib-builder
3232
uses: actions/checkout@v5

‎.github/workflows/curl_cmake.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
matrix:
2828
arch: [x64, x86]
29-
runs-on: windows-2022
29+
runs-on: ${{ (inputs.php == '8.6' || inputs.php == 'master') && 'windows-2025-vs2026' || 'windows-2022' }}
3030
steps:
3131
- name: Checkout winlib-builder
3232
uses: actions/checkout@v4
@@ -55,7 +55,7 @@ jobs:
5555
- name: Configure curl
5656
run: |
5757
cd curl
58-
cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}}^
58+
cmake -G "Visual Studio ${{steps.virtuals.outputs.vsnum}} ${{steps.virtuals.outputs.vsyear}}" -A ${{steps.virtuals.outputs.msarch}}^
5959
-T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}}^
6060
-DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DBUILD_STATIC_CURL=ON -DSHARE_LIB_OBJECT=OFF -DBUILD_LIBCURL_DOCS=OFF^
6161
-DCMAKE_PREFIX_PATH:PATH=%GITHUB_WORKSPACE%\deps^

‎.github/workflows/cyrus-sasl.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
matrix:
2828
arch: [x64, x86]
29-
runs-on: windows-2022
29+
runs-on: ${{ (inputs.php == '8.6' || inputs.php == 'master') && 'windows-2025-vs2026' || 'windows-2022' }}
3030
steps:
3131
- name: Checkout winlib-builder
3232
uses: actions/checkout@v5

‎.github/workflows/enchant.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
matrix:
2828
arch: [x64, x86]
29-
runs-on: windows-2022
29+
runs-on: ${{ (inputs.php == '8.6' || inputs.php == 'master') && 'windows-2025-vs2026' || 'windows-2022' }}
3030
steps:
3131
- name: Checkout winlib-builder
3232
uses: actions/checkout@v5

‎.github/workflows/fbclient.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
arch: [x64, x86]
20-
runs-on: windows-2022
20+
runs-on: ${{ (inputs.php == '8.6' || inputs.php == 'master') && 'windows-2025-vs2026' || 'windows-2022' }}
2121
steps:
2222
- name: Checkout winlib-builder
2323
uses: actions/checkout@v6

‎.github/workflows/freetype.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
matrix:
1818
arch: [x64, x86]
19-
runs-on: windows-2022
19+
runs-on: ${{ (inputs.php == '8.6' || inputs.php == 'master') && 'windows-2025-vs2026' || 'windows-2022' }}
2020
steps:
2121
- name: Checkout winlib-builder
2222
uses: actions/checkout@v5

‎.github/workflows/freetype_cmake.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
matrix:
1818
arch: [x64, x86]
19-
runs-on: windows-2022
19+
runs-on: ${{ (inputs.php == '8.6' || inputs.php == 'master') && 'windows-2025-vs2026' || 'windows-2022' }}
2020
steps:
2121
- name: Checkout winlib-builder
2222
uses: actions/checkout@v5
@@ -32,7 +32,7 @@ jobs:
3232
id: virtuals
3333
run: powershell winlib-builder/scripts/compute-virtuals -version ${{github.event.inputs.php}} -arch ${{matrix.arch}}
3434
- name: Configure freetype
35-
run: cd freetype && md build && cd build && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} ..
35+
run: cd freetype && md build && cd build && cmake -G "Visual Studio ${{steps.virtuals.outputs.vsnum}} ${{steps.virtuals.outputs.vsyear}}" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} ..
3636
- name: Build freetype
3737
run: cd freetype\build && cmake --build . --config RelWithDebInfo
3838
- name: Install freetype

0 commit comments

Comments
 (0)