Skip to content

Commit d8864c7

Browse files
committed
Skip patch in Clang runs
1 parent 5175bd7 commit d8864c7

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

.github/workflows/dependencies/install_hdf5_blosc2

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@ patch_url="https://github.com/franzpoeschel/HDF5-Blosc2/commit/55b1feea7bf18a539
1010
patch_path="$(pwd)/hdf5_blosc2_cmake_fixes.patch"
1111

1212

13-
curl -sLo "$patch_path" "$patch_url"
1413
git clone -b "$version" https://github.com/Blosc/HDF5-Blosc2
1514
cd HDF5-Blosc2
16-
git config user.email "tooling@tools.com"
17-
git config user.name "Tooling"
18-
git am "$patch_path"
15+
16+
if [[ -z "$SKIP_HDF5_BLOSC2_PATCH" ]]; then
17+
curl -sLo "$patch_path" "$patch_url"
18+
git config user.email "tooling@tools.com"
19+
git config user.name "Tooling"
20+
git am "$patch_path"
21+
fi
1922

2023
cmake . -B build -DBUILD_TESTS=OFF
2124
cmake --build build --parallel 4

.github/workflows/linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
eval $(spack env activate --sh .github/ci/spack-envs/clang11_nopy_ompi_h5_ad2_libcpp/)
6868
spack install
6969
70-
./.github/workflows/dependencies/install_hdf5_blosc2
70+
SKIP_HDF5_BLOSC2_PATCH=1 ./.github/workflows/dependencies/install_hdf5_blosc2
7171
7272
share/openPMD/download_samples.sh build
7373
cmake -S . -B build \
@@ -107,7 +107,7 @@ jobs:
107107
eval $(spack env activate --sh .github/ci/spack-envs/clang11_nopy_ompi_h5_ad2/)
108108
spack install
109109
110-
./.github/workflows/dependencies/install_hdf5_blosc2
110+
SKIP_HDF5_BLOSC2_PATCH=1 ./.github/workflows/dependencies/install_hdf5_blosc2
111111
112112
share/openPMD/download_samples.sh build
113113
cmake -S . -B build \

0 commit comments

Comments
 (0)