Skip to content

Commit f1b8d83

Browse files
committed
Fix workstep step being skipped with CMake
1 parent 2a5f5c8 commit f1b8d83

File tree

1 file changed

+7
-25
lines changed

1 file changed

+7
-25
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,7 @@ jobs:
3535
build_system: ["autotools", "cmake"]
3636
python-version: ["3.10"]
3737
hdf5-branch: ["hdf5_1_14", "develop"]
38-
compiler: ["gcc-11", "gcc-12", "gcc-13"]
3938
exclude:
40-
# Ubuntu 22.04 runner does not have gcc-13
41-
- os: ubuntu-22.04
42-
compiler: "gcc-13"
43-
# Ubuntu 24.04 runner does not have gcc-11
44-
- os: ubuntu-latest
45-
compiler: "gcc-11"
4639
# hdf5 2.0.0+ does not support autotools
4740
- hdf5-branch: "develop"
4841
build_system: "autotools"
@@ -79,12 +72,10 @@ jobs:
7972
cd ./build
8073
cmake \
8174
-DHDF5_BUILD_HL_LIB=ON \
82-
-DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_SZIP_SUPPORT=OFF \
75+
-DBUILD_SHARED_LIBS=ON \
8376
-DHDF5_TEST_API=ON \
84-
-DHDF5_ENABLE_Z_LIB_SUPPORT=OFF \
85-
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DHDF5_ENABLE_THREADSAFE=OFF \
77+
-DCMAKE_BUILD_TYPE=Release \
8678
-DCMAKE_INSTALL_PREFIX=${{github.workspace}}/hdf5install \
87-
-DCMAKE_C_COMPILER=${{matrix.compiler}} \
8879
..
8980
make
9081
make install
@@ -97,8 +88,7 @@ jobs:
9788
./autogen.sh
9889
./configure --prefix=${{github.workspace}}/hdf5install \
9990
--enable-hl --disable-threadsafe \
100-
--enable-build-mode=production --enable-shared \
101-
CC=${{matrix.compiler}}
91+
--enable-build-mode=production --enable-shared
10292
make
10393
make install
10494
shell: bash
@@ -111,7 +101,6 @@ jobs:
111101
cd ./build
112102
CFLAGS="-D_POSIX_C_SOURCE=200809L" cmake -G "Unix Makefiles" -DHDF5_ROOT=${{github.workspace}}/hdf5install \
113103
-DCMAKE_INSTALL_PREFIX=${{github.workspace}}/vol-rest/install \
114-
-DCMAKE_C_COMPILER=${{matrix.compiler}} \
115104
..
116105
shell: bash
117106
working-directory: ${{github.workspace}}/vol-rest
@@ -123,8 +112,7 @@ jobs:
123112
mkdir ${{github.workspace}}/vol-rest/install
124113
CFLAGS="-D_POSIX_C_SOURCE=200809L" ./configure \
125114
--prefix=${{github.workspace}}/vol-rest/install \
126-
--with-hdf5=${{github.workspace}}/hdf5install \
127-
CC=${{matrix.compiler}}
115+
--with-hdf5=${{github.workspace}}/hdf5install
128116
shell: bash
129117
working-directory: ${{github.workspace}}/vol-rest
130118

@@ -173,12 +161,6 @@ jobs:
173161
cd ${{github.workspace}}/hsds
174162
pytest
175163
176-
- name: Install valgrind
177-
run: |
178-
sudo apt update
179-
sudo apt install valgrind
180-
working-directory: ${{ github.workspace }}
181-
182164
# Requests 2.32.0 breaks requests-unixsocket, used by HSDS for socket connections
183165
- name: Fix requests version
184166
run: |
@@ -209,10 +191,10 @@ jobs:
209191
HDF5_PLUGIN_PATH=${{github.workspace}}/vol-rest/install/lib HDF5_VOL_CONNECTOR=REST ./test/test_rest_vol
210192
211193
- name: Test REST VOL (CMake)
212-
if: matrix.build_system == 'cmmake'
194+
if: matrix.build_system == 'cmake'
213195
working-directory: ${{github.workspace}}/vol-rest/build/
214196
run: |
215-
valgrind --leak-check=full -s ctest -R "test_rest_vol" -VV
197+
ctest -R "test_rest_vol" -VV
216198
217199
- name: Show HSDS Logs on Fail
218200
if: ${{failure()}}
@@ -223,5 +205,5 @@ jobs:
223205
# TODO: Attribute, dataset, link, and testhdf5 tests currently fail
224206
# - name: Test REST VOL with API
225207
# run: |
226-
# valgrind --leak-check=full -s ctest -R "vol-rest" -VV
208+
# ctest -R "vol-rest" -VV
227209
# working-directory: ${{github.workspace}}/hdf5/build/

0 commit comments

Comments
 (0)