From 88cbaa0c1dffc05e39e8e12a9b7d1faf7112ab94 Mon Sep 17 00:00:00 2001
From: Jon Griffiths <jon_p_griffiths@yahoo.com>
Date: Mon, 6 Nov 2023 20:33:01 +1300
Subject: [PATCH] build: simplify internal CI slightly

---
 .gitlab-ci.yml           | 11 ++++-------
 contrib/bullseye_deps.sh |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e258de2b..a9b8a4062 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
 build_wally_release_files:
-  image: greenaddress/wallycore@sha256:eb0bdb6119f40df02bbc3cd38ba64ea1c3de64c2d065e61a0447986068fca6be
+  image: greenaddress/wallycore@sha256:21112c3d05f0f541a43636bb5c7e1826292f9c66fca0b68546b963adac4fc4c3
   artifacts:
     expire_in: 7 days
     name: wallycore-bindings
@@ -18,8 +18,7 @@ build_wally_release_files:
     - pip install --find-links=./dist wallycore
     - python -c "import wallycore as w; assert w.hex_from_bytes(w.hex_to_bytes('ff')) == 'ff'"
     - deactivate
-    - rm -rf .smoketest
-    - rm dist/*.whl
+    - rm -rf .smoketest dist/*.whl
     - mv dist wally_dist
     - ./tools/build_android_libraries.sh
     - mv release wallycore-android-jni
@@ -37,7 +36,7 @@ build_wally_release_files:
     - rmdir wally_dist
 
 build_mingw_static:
-  image: greenaddress/wallycore@sha256:eb0bdb6119f40df02bbc3cd38ba64ea1c3de64c2d065e61a0447986068fca6be
+  image: greenaddress/wallycore@sha256:21112c3d05f0f541a43636bb5c7e1826292f9c66fca0b68546b963adac4fc4c3
   tags:
     - ga
   script:
@@ -46,15 +45,13 @@ build_mingw_static:
     - make -j $(($(grep ^processor /proc/cpuinfo | wc -l) / 2))
 
 run_tests:
-  image: greenaddress/wallycore@sha256:eb0bdb6119f40df02bbc3cd38ba64ea1c3de64c2d065e61a0447986068fca6be
+  image: greenaddress/wallycore@sha256:21112c3d05f0f541a43636bb5c7e1826292f9c66fca0b68546b963adac4fc4c3
   tags:
     - ga
   artifacts:
     reports:
       codequality: valgrind.json
   script:
-    - apt install --no-install-recommends valgrind jq -yqq
-    - pip install valgrind-codequality
     - ./tools/cleanup.sh && ./tools/autogen.sh
     - ./configure --enable-export-all --enable-swig-python --enable-swig-java --enable-shared --disable-static
     - make -j $(($(grep ^processor /proc/cpuinfo | wc -l) / 2))
diff --git a/contrib/bullseye_deps.sh b/contrib/bullseye_deps.sh
index b5c71460d..ea4174dcb 100755
--- a/contrib/bullseye_deps.sh
+++ b/contrib/bullseye_deps.sh
@@ -34,13 +34,13 @@ windows_packages=
 if [ -z "$skip_windows" ]; then
     windows_packages="g++-mingw-w64-x86-64"
 fi
-apt install --no-install-recommends unzip autoconf automake autotools-dev pkg-config build-essential libtool python3{,-dev,-pip,-virtualenv} python{,-dev}-is-python3 clang{,-format,-tidy} git swig curl cmake libssl-dev libtool-bin $java_packages curl $windows_packages -yqq
+apt install --no-install-recommends unzip autoconf automake autotools-dev pkg-config build-essential libtool python3{,-dev,-pip,-virtualenv} python{,-dev}-is-python3 clang{,-format,-tidy} git swig curl cmake libssl-dev libtool-bin $java_packages curl $windows_packages valgrind jq -yqq
 
 if [ -z "$skip_java" ]; then
     update-java-alternatives -s java-1.11.0-openjdk-amd64
 fi
 
-pip3 install -r contrib/requirements.txt
+pip3 install valgrind-codequality -r contrib/requirements.txt
 
 pushd /opt