Skip to content

Commit fafd3f7

Browse files
committed
codeql missing venv and build error check failure fix
1 parent 50429da commit fafd3f7

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,16 @@ jobs:
9797
shell: bash
9898
run: |
9999
echo "Starting manual build for CodeQL..."
100-
100+
101+
apt-get update
102+
apt-get install -y python3-venv
103+
101104
export DOCKER_ENTRYPOINT_SOURCE_ONLY=1
102105
. /usr/local/bin/docker-entrypoint.sh
103106
module load geant4
104-
105-
./ci/build.sh
106-
107+
108+
./ci/build.sh
109+
107110
echo "Manual build finished."
108111
109112
- name: Perform CodeQL Analysis

ci/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ meson_option=$(meson_setup_options $1)
2929
meson setup build $=meson_option
3030
} | tee -a $setup_log
3131

32-
33-
if [ $? -ne 0 ]; then
32+
# $? reflects tee's exit code in a pipeline; use ${pipestatus[1]} for meson's.
33+
if [ ${pipestatus[1]} -ne 0 ]; then
3434
echo " > Meson Configure failed. Log: "
3535
cat $setup_log
3636
exit 1

0 commit comments

Comments
 (0)