Skip to content

Commit 87363b0

Browse files
committed
using g4v from tags
1 parent 7436814 commit 87363b0

4 files changed

Lines changed: 10 additions & 5 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
schedule:
99
- cron: '20 2 * * 5'
1010

11+
# default geant4 version.
12+
env:
13+
CONTAINER: g4install:11.4.0-ubuntu-24.04 # default geant4 tag
14+
1115
jobs:
1216
analyze:
1317
name: Analyze (${{ matrix.language }})
@@ -29,7 +33,7 @@ jobs:
2933
contents: read
3034

3135
# Use a container with G4 installed
32-
container: ghcr.io/gemc/g4install:11.4.0-ubuntu-24.04
36+
container: env.CONTAINER
3337

3438
strategy:
3539
fail-fast: false
@@ -86,7 +90,7 @@ jobs:
8690
run: |
8791
echo "Starting manual build for CodeQL..."
8892
DOCKER_ENTRYPOINT_SOURCE_ONLY=1 . /usr/local/bin/docker-entrypoint.sh \
89-
module load geant4/11.4.0 \
93+
module load geant4 \
9094
./ci/build.sh
9195
echo "Manual build finished."
9296

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ permissions:
44
contents: read
55
packages: write
66

7-
# default varsions. This is overwritten by distros_tags.sh
7+
# default versions. This is overwritten by distros_tags.sh
88
env:
99
GEMC_TAG: dev # default gemc tag
1010
GEANT4_TAG: 11.4.0 # default geant4 tag

.github/workflows/sanitize.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ jobs:
5959
- name: Sanitizer ${{ matrix.sanitizer }}
6060
shell: bash
6161
run: |
62-
set -euo pipefail
6362
echo "Starting manual build for sanitizer: ${{ matrix.sanitizer }}"
6463
DOCKER_ENTRYPOINT_SOURCE_ONLY=1 . /usr/local/bin/docker-entrypoint.sh \
65-
module load geant4/11.4.0 \
64+
module load geant4/"${{ matrix.g4v }}" \
6665
./ci/build.sh "${{ matrix.sanitizer }}"
66+
echo "Manual build for sanitizer: ${{ matrix.sanitizer }} completed"
6767
6868
build-with-sanitizer-final:
6969
name: Sanitize - summary

ci/sanitizers_tags.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ build_matrix_build() {
8383
body+="\"container\":\"ghcr.io/gemc/g4install:${g4v}-${os}-${ver}\","
8484
body+="\"baseos\":\"${os}\","
8585
body+="\"runner\":\"${runner}\","
86+
body+="\"g4v\":\"${g4v}\","
8687
body+="\"arch\":\"${cpuv}\","
8788
body+="\"sanitizer\":\"${sanitizer}\""
8889
body+="}"

0 commit comments

Comments
 (0)