Skip to content

Commit a26ca12

Browse files
philippeVerneyphilippeVerney
committed
CI: bump FESAPI to 2.14.1
1 parent 7abed3c commit a26ca12

1 file changed

Lines changed: 26 additions & 18 deletions

File tree

‎.github/workflows/github-actions.yml‎

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,18 @@ jobs:
77
- uses: actions/checkout@v5
88
- name: zlib install
99
run: |
10-
curl -L "https://zlib.net/current/zlib.tar.gz" -o "${{ runner.temp }}\zlib.tar.gz"
10+
# Download and extract
11+
curl -L "https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz" -o "${{ runner.temp }}\zlib.tar.gz"
1112
cd ${{ runner.temp }}
12-
tar -xzf ${{ runner.temp }}\zlib.tar.gz
13+
tar -xzf zlib.tar.gz
14+
# Detect extracted folder (handles zlib-1.3.1 or future versions)
15+
$zlibSrc = Get-ChildItem -Directory | Where-Object { $_.Name -like "zlib-*" } | Select-Object -First 1
16+
Write-Host ("Detected zlib source folder: " + $zlibSrc.FullName)
17+
# Build directory
1318
mkdir zlib-build
1419
cd zlib-build
15-
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/zlib-install ${{ runner.temp }}/zlib-1.3.1
20+
# Configure and install
21+
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/zlib-install $zlibSrc.FullName
1622
cmake --build . --config Release -j2
1723
cmake --build . --config Release --target INSTALL
1824
- name: Boost install
@@ -41,12 +47,18 @@ jobs:
4147
- uses: actions/checkout@v5
4248
- name: zlib install
4349
run: |
44-
curl -L "https://zlib.net/current/zlib.tar.gz" -o "${{ runner.temp }}\zlib.tar.gz"
50+
# Download and extract
51+
curl -L "https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz" -o "${{ runner.temp }}\zlib.tar.gz"
4552
cd ${{ runner.temp }}
46-
tar -xzf ${{ runner.temp }}\zlib.tar.gz
53+
tar -xzf zlib.tar.gz
54+
# Detect extracted folder (handles zlib-1.3.1 or future versions)
55+
$zlibSrc = Get-ChildItem -Directory | Where-Object { $_.Name -like "zlib-*" } | Select-Object -First 1
56+
Write-Host ("Detected zlib source folder: " + $zlibSrc.FullName)
57+
# Build directory
4758
mkdir zlib-build
4859
cd zlib-build
49-
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/zlib-install ${{ runner.temp }}/zlib-1.3.1
60+
# Configure and install
61+
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/zlib-install $zlibSrc.FullName
5062
cmake --build . --config Release -j2
5163
cmake --build . --config Release --target INSTALL
5264
- name: Boost install
@@ -154,7 +166,7 @@ jobs:
154166
sudo apt install -y ${{ matrix.xcc_pkg }} libhdf5-dev libminizip-dev libboost-all-dev
155167
- name: FESAPI install
156168
run: |
157-
git clone --branch v2.14.0.0 --single-branch https://github.com/F2I-Consulting/fesapi.git ${{ runner.temp }}/fesapi-src
169+
git clone --branch v2.14.1.0 --single-branch https://github.com/F2I-Consulting/fesapi.git ${{ runner.temp }}/fesapi-src
158170
cd ${{ runner.temp }}
159171
mkdir fesapi-build
160172
cd fesapi-build
@@ -178,7 +190,7 @@ jobs:
178190
cd ${{ github.workspace }}/..
179191
mkdir build
180192
cd build
181-
cmake -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_FESAPI=TRUE -DFESAPI_ROOT=${{ runner.temp }}/fesapi-install -DFESAPI_JAR=${{ runner.temp }}/fesapi-install/lib/fesapiJava-2.14.0.0.jar -DWITH_JAVA_WRAPPING=TRUE ${{ github.workspace }} -DCMAKE_C_COMPILER=${{ matrix.cc }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }}
193+
cmake -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_FESAPI=TRUE -DFESAPI_ROOT=${{ runner.temp }}/fesapi-install -DFESAPI_JAR=${{ runner.temp }}/fesapi-install/lib/fesapiJava-2.14.1.0.jar -DWITH_JAVA_WRAPPING=TRUE ${{ github.workspace }} -DCMAKE_C_COMPILER=${{ matrix.cc }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }}
182194
cmake --build . --config Release -j2
183195
build_wheels_windows:
184196
name: Build wheels on windows-latest
@@ -197,12 +209,10 @@ jobs:
197209
CIBW_BEFORE_ALL: >
198210
%VCPKG_INSTALLATION_ROOT%\vcpkg install boost-uuid minizip hdf5[zlib] &&
199211
cd ${{ runner.temp }} &&
200-
curl -L "https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.14.0.0.tar.gz" -o "${{ runner.temp }}\fesapi-2.14.0.0.tar.gz" &&
201-
7z x ${{ runner.temp }}\fesapi-2.14.0.0.tar.gz -o${{ runner.temp }} &&
202-
7z x ${{ runner.temp }}\fesapi-2.14.0.0.tar -o${{ runner.temp }} &&
212+
git clone --branch v2.14.1.0 --single-branch https://github.com/F2I-Consulting/fesapi.git ${{ runner.temp }}/fesapi-src &&
203213
mkdir fesapi-build &&
204214
cd fesapi-build &&
205-
cmake -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/fesapi-install ${{ runner.temp }}\fesapi-2.14.0.0 &&
215+
cmake -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/fesapi-install ${{ runner.temp }}\fesapi-src &&
206216
cmake --build . --config Release -j2 &&
207217
cmake --build . --config Release --target INSTALL &&
208218
%VCPKG_INSTALLATION_ROOT%\vcpkg install bext-wintls boost-beast avro-cpp &&
@@ -254,11 +264,10 @@ jobs:
254264
cmake3 --build . -j2 &&
255265
cmake3 --install . &&
256266
cd / &&
257-
wget https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.14.0.0.zip &&
258-
unzip v2.14.0.0.zip &&
267+
git clone --branch v2.14.1.0 --single-branch https://github.com/F2I-Consulting/fesapi.git /fesapi-src &&
259268
mkdir fesapi-build &&
260269
cd fesapi-build &&
261-
cmake3 -DCMAKE_BUILD_TYPE=Release -DHDF5_ROOT=/hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DCMAKE_INSTALL_PREFIX:STRING=/fesapi-install /fesapi-2.14.0.0 &&
270+
cmake3 -DCMAKE_BUILD_TYPE=Release -DHDF5_ROOT=/hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DCMAKE_INSTALL_PREFIX:STRING=/fesapi-install /fesapi-src &&
262271
cmake3 --build . -j2 &&
263272
cmake3 --install . &&
264273
cd / &&
@@ -324,11 +333,10 @@ jobs:
324333
cmake --build . --config Release -j2 &&
325334
cmake --install . &&
326335
cd ${{ github.workspace }}/.. &&
327-
wget --no-verbose https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.14.0.0.zip &&
328-
unzip v2.14.0.0.zip &&
336+
git clone --branch v2.14.1.0 --single-branch https://github.com/F2I-Consulting/fesapi.git ${{ github.workspace }}/../fesapi-src &&
329337
mkdir fesapi-build &&
330338
cd fesapi-build &&
331-
cmake -DCMAKE_BUILD_TYPE=Release -DBOOST_ROOT=${{ github.workspace }}/../boost-install -DMINIZIP_ROOT=${{ github.workspace }}/../minizip-install -DHDF5_ROOT=${{ github.workspace }}/../hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DCMAKE_INSTALL_PREFIX:STRING=${{ github.workspace }}/../fesapi-install ${{ github.workspace }}/../fesapi-2.14.0.0 &&
339+
cmake -DCMAKE_BUILD_TYPE=Release -DBOOST_ROOT=${{ github.workspace }}/../boost-install -DMINIZIP_ROOT=${{ github.workspace }}/../minizip-install -DHDF5_ROOT=${{ github.workspace }}/../hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DCMAKE_INSTALL_PREFIX:STRING=${{ github.workspace }}/../fesapi-install ${{ github.workspace }}/../fesapi-src &&
332340
cmake --build . -j2 --config Release &&
333341
cmake --install . &&
334342
cd ${{ github.workspace }}/.. &&

0 commit comments

Comments
 (0)