Skip to content

Commit c27b6ae

Browse files
committed
ci(fp-stability): build Verrou via the shared bootstrap script (DRY)
Replace the inline Valgrind+Verrou build in the workflow with a call to toolchain/bootstrap/verrou.sh, so the local installer and CI share one pinned recipe (no drift between them). Cache gating and the system-deps step are unchanged; the build step is still skipped on a cache hit. Tightened the verify step to '--tool=verrou --version', and noted that the cache key's pinned versions must track the script.
1 parent d3919d5 commit c27b6ae

1 file changed

Lines changed: 3 additions & 18 deletions

File tree

.github/workflows/fp-stability.yml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ jobs:
6868
uses: actions/cache@v4
6969
with:
7070
path: ~/.local/verrou
71+
# Keep these versions in sync with toolchain/bootstrap/verrou.sh (the builder).
7172
key: verrou-a58d434-valgrind-3.26.0-${{ runner.os }}
7273

7374
- name: Install system dependencies
@@ -79,26 +80,10 @@ jobs:
7980
8081
- name: Build Verrou
8182
if: steps.cache-verrou.outputs.cache-hit != 'true'
82-
run: |
83-
cd /tmp
84-
wget -q https://sourceware.org/pub/valgrind/valgrind-3.26.0.tar.bz2
85-
tar xf valgrind-3.26.0.tar.bz2
86-
87-
git clone https://github.com/edf-hpc/verrou.git
88-
git -C verrou checkout a58d434
89-
90-
# Merge Verrou into Valgrind source tree and patch
91-
cp -r verrou valgrind-3.26.0/verrou
92-
cd valgrind-3.26.0
93-
cat verrou/valgrind.*diff | patch -p1
94-
95-
./autogen.sh
96-
./configure --enable-only64bit --prefix="$HOME/.local/verrou"
97-
make -j"$(nproc)"
98-
make install
83+
run: bash toolchain/bootstrap/verrou.sh
9984

10085
- name: Verify Verrou
101-
run: ~/.local/verrou/bin/valgrind --version
86+
run: ~/.local/verrou/bin/valgrind --tool=verrou --version
10287

10388
- name: Build MFC (debug, serial)
10489
# FFLAGS=-fno-inline prevents gfortran from inlining small functions into

0 commit comments

Comments
 (0)