Skip to content

Commit c911fb4

Browse files
HertzDevilHertzDevil
authored
Update library versions for MSVC CI (#15554)
1 parent a2af026 commit c911fb4

File tree

3 files changed

+20
-22
lines changed

3 files changed

+20
-22
lines changed

‎.github/workflows/win.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ concurrency:
1010

1111
env:
1212
SPEC_SPLIT_DOTS: 160
13-
CI_LLVM_VERSION: "18.1.1"
13+
CI_LLVM_VERSION: "19.1.7"
1414

1515
jobs:
1616
x86_64-windows-libs:
@@ -50,19 +50,19 @@ jobs:
5050
key: win-libs-${{ hashFiles('.github/workflows/win.yml', 'etc/win-ci/*.ps1') }}-msvc
5151
- name: Build libgc
5252
if: steps.cache-libs.outputs.cache-hit != 'true'
53-
run: .\etc\win-ci\build-gc.ps1 -BuildTree deps\gc -Version 8.2.6 -AtomicOpsVersion 7.8.2
53+
run: .\etc\win-ci\build-gc.ps1 -BuildTree deps\gc -Version 8.2.8 -AtomicOpsVersion 7.8.2
5454
- name: Build libpcre
5555
if: steps.cache-libs.outputs.cache-hit != 'true'
5656
run: .\etc\win-ci\build-pcre.ps1 -BuildTree deps\pcre -Version 8.45
5757
- name: Build libpcre2
5858
if: steps.cache-libs.outputs.cache-hit != 'true'
59-
run: .\etc\win-ci\build-pcre2.ps1 -BuildTree deps\pcre2 -Version 10.43
59+
run: .\etc\win-ci\build-pcre2.ps1 -BuildTree deps\pcre2 -Version 10.45
6060
- name: Build libiconv
6161
if: steps.cache-libs.outputs.cache-hit != 'true'
62-
run: .\etc\win-ci\build-iconv.ps1 -BuildTree deps\iconv -Version 1.17
62+
run: .\etc\win-ci\build-iconv.ps1 -BuildTree deps\iconv -Version 1.18
6363
- name: Build libffi
6464
if: steps.cache-libs.outputs.cache-hit != 'true'
65-
run: .\etc\win-ci\build-ffi.ps1 -BuildTree deps\ffi -Version 3.4.6
65+
run: .\etc\win-ci\build-ffi.ps1 -BuildTree deps\ffi -Version 3.4.7
6666
- name: Build zlib
6767
if: steps.cache-libs.outputs.cache-hit != 'true'
6868
run: .\etc\win-ci\build-z.ps1 -BuildTree deps\z -Version 1.3.1
@@ -74,7 +74,7 @@ jobs:
7474
run: .\etc\win-ci\build-yaml.ps1 -BuildTree deps\yaml -Version 0.2.5
7575
- name: Build libxml2
7676
if: steps.cache-libs.outputs.cache-hit != 'true'
77-
run: .\etc\win-ci\build-xml2.ps1 -BuildTree deps\xml2 -Version 2.12.5
77+
run: .\etc\win-ci\build-xml2.ps1 -BuildTree deps\xml2 -Version 2.13.6
7878

7979
- name: Cache OpenSSL
8080
id: cache-openssl
@@ -84,13 +84,13 @@ jobs:
8484
libs/crypto.lib
8585
libs/ssl.lib
8686
libs/openssl_VERSION
87-
key: win-openssl-libs-3.1.0-${{ hashFiles('etc/win-ci/build-openssl.ps1') }}-msvc
87+
key: win-openssl-libs-3.4.1-${{ hashFiles('etc/win-ci/build-openssl.ps1') }}-msvc
8888
- name: Set up NASM
8989
if: steps.cache-openssl.outputs.cache-hit != 'true'
9090
uses: ilammy/setup-nasm@72793074d3c8cdda771dba85f6deafe00623038b # v1.5.2
9191
- name: Build OpenSSL
9292
if: steps.cache-openssl.outputs.cache-hit != 'true'
93-
run: .\etc\win-ci\build-openssl.ps1 -BuildTree deps\openssl -Version 3.1.0
93+
run: .\etc\win-ci\build-openssl.ps1 -BuildTree deps\openssl -Version 3.4.1
9494

9595
x86_64-windows-dlls:
9696
runs-on: windows-2022
@@ -138,19 +138,19 @@ jobs:
138138
key: win-dlls-${{ hashFiles('.github/workflows/win.yml', 'etc/win-ci/*.ps1') }}-msvc
139139
- name: Build libgc
140140
if: steps.cache-dlls.outputs.cache-hit != 'true'
141-
run: .\etc\win-ci\build-gc.ps1 -BuildTree deps\gc -Version 8.2.6 -AtomicOpsVersion 7.8.2 -Dynamic
141+
run: .\etc\win-ci\build-gc.ps1 -BuildTree deps\gc -Version 8.2.8 -AtomicOpsVersion 7.8.2 -Dynamic
142142
- name: Build libpcre
143143
if: steps.cache-dlls.outputs.cache-hit != 'true'
144144
run: .\etc\win-ci\build-pcre.ps1 -BuildTree deps\pcre -Version 8.45 -Dynamic
145145
- name: Build libpcre2
146146
if: steps.cache-dlls.outputs.cache-hit != 'true'
147-
run: .\etc\win-ci\build-pcre2.ps1 -BuildTree deps\pcre2 -Version 10.43 -Dynamic
147+
run: .\etc\win-ci\build-pcre2.ps1 -BuildTree deps\pcre2 -Version 10.45 -Dynamic
148148
- name: Build libiconv
149149
if: steps.cache-dlls.outputs.cache-hit != 'true'
150-
run: .\etc\win-ci\build-iconv.ps1 -BuildTree deps\iconv -Version 1.17 -Dynamic
150+
run: .\etc\win-ci\build-iconv.ps1 -BuildTree deps\iconv -Version 1.18 -Dynamic
151151
- name: Build libffi
152152
if: steps.cache-dlls.outputs.cache-hit != 'true'
153-
run: .\etc\win-ci\build-ffi.ps1 -BuildTree deps\ffi -Version 3.4.6 -Dynamic
153+
run: .\etc\win-ci\build-ffi.ps1 -BuildTree deps\ffi -Version 3.4.7 -Dynamic
154154
- name: Build zlib
155155
if: steps.cache-dlls.outputs.cache-hit != 'true'
156156
run: .\etc\win-ci\build-z.ps1 -BuildTree deps\z -Version 1.3.1 -Dynamic
@@ -162,7 +162,7 @@ jobs:
162162
run: .\etc\win-ci\build-yaml.ps1 -BuildTree deps\yaml -Version 0.2.5 -Dynamic
163163
- name: Build libxml2
164164
if: steps.cache-dlls.outputs.cache-hit != 'true'
165-
run: .\etc\win-ci\build-xml2.ps1 -BuildTree deps\xml2 -Version 2.12.5 -Dynamic
165+
run: .\etc\win-ci\build-xml2.ps1 -BuildTree deps\xml2 -Version 2.13.6 -Dynamic
166166

167167
- name: Cache OpenSSL
168168
id: cache-openssl-dlls
@@ -173,13 +173,13 @@ jobs:
173173
libs/ssl-dynamic.lib
174174
dlls/libcrypto-3-x64.dll
175175
dlls/libssl-3-x64.dll
176-
key: win-openssl-dlls-3.1.0-${{ hashFiles('etc/win-ci/build-openssl.ps1') }}-msvc
176+
key: win-openssl-dlls-3.4.1-${{ hashFiles('etc/win-ci/build-openssl.ps1') }}-msvc
177177
- name: Set up NASM
178178
if: steps.cache-openssl-dlls.outputs.cache-hit != 'true'
179179
uses: ilammy/setup-nasm@72793074d3c8cdda771dba85f6deafe00623038b # v1.5.2
180180
- name: Build OpenSSL
181181
if: steps.cache-openssl-dlls.outputs.cache-hit != 'true'
182-
run: .\etc\win-ci\build-openssl.ps1 -BuildTree deps\openssl -Version 3.1.0 -Dynamic
182+
run: .\etc\win-ci\build-openssl.ps1 -BuildTree deps\openssl -Version 3.4.1 -Dynamic
183183

184184
x86_64-windows-llvm-libs:
185185
runs-on: windows-2022
@@ -235,7 +235,7 @@ jobs:
235235
uses: ./.github/workflows/win_build_portable.yml
236236
with:
237237
release: true
238-
llvm_version: "18.1.1"
238+
llvm_version: "19.1.7"
239239

240240
x86_64-windows-test:
241241
runs-on: windows-2022

‎.github/workflows/win_build_portable.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
libs/crypto.lib
5555
libs/ssl.lib
5656
libs/openssl_VERSION
57-
key: win-openssl-libs-3.1.0-${{ hashFiles('etc/win-ci/build-openssl.ps1') }}-msvc
57+
key: win-openssl-libs-3.4.1-${{ hashFiles('etc/win-ci/build-openssl.ps1') }}-msvc
5858
fail-on-cache-miss: true
5959
- name: Restore DLLs
6060
uses: actions/cache/restore@v4
@@ -88,7 +88,7 @@ jobs:
8888
libs/ssl-dynamic.lib
8989
dlls/libcrypto-3-x64.dll
9090
dlls/libssl-3-x64.dll
91-
key: win-openssl-dlls-3.1.0-${{ hashFiles('etc/win-ci/build-openssl.ps1') }}-msvc
91+
key: win-openssl-dlls-3.4.1-${{ hashFiles('etc/win-ci/build-openssl.ps1') }}-msvc
9292
fail-on-cache-miss: true
9393
- name: Restore LLVM
9494
uses: actions/cache/restore@v4
@@ -110,10 +110,6 @@ jobs:
110110
run: |
111111
echo "CRYSTAL_LIBRARY_PATH=$(pwd)\libs" >> ${env:GITHUB_ENV}
112112
echo "LLVM_CONFIG=$(pwd)\llvm\bin\llvm-config.exe" >> ${env:GITHUB_ENV}
113-
# NOTE: the name of the libiconv DLL has changed, so we manually copy
114-
# the new one to the existing Crystal installation; remove after
115-
# updating the base compiler to 1.14
116-
cp dlls/iconv-2.dll ${{ steps.install-crystal.outputs.path }}
117113
118114
- name: Build LLVM extensions
119115
run: make -f Makefile.win deps

‎etc/win-ci/build-pcre2.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ param(
1010
Setup-Git -Path $BuildTree -Url https://github.com/PCRE2Project/pcre2.git -Ref pcre2-$Version
1111

1212
Run-InDirectory $BuildTree {
13+
& $git submodule update --init
14+
1315
$args = "-DPCRE2_BUILD_PCRE2GREP=OFF -DPCRE2_BUILD_TESTS=OFF -DPCRE2_SUPPORT_UNICODE=ON -DPCRE2_SUPPORT_JIT=ON -DCMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH=OFF"
1416
if ($Dynamic) {
1517
$args = "-DBUILD_STATIC_LIBS=OFF -DBUILD_SHARED_LIBS=ON $args"

0 commit comments

Comments
 (0)