aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCecylia Bocovich <cohosh@torproject.org>2024-02-14 14:41:22 -0500
committerCecylia Bocovich <cohosh@torproject.org>2024-02-27 13:41:43 -0500
commit810f1fcc00b5f18811875c12f719a5330fb8edf0 (patch)
tree0cc420a9b57e8131886911a5cbf81b4dee7ba6ad
parent2c16ef83cbadf10f064d702bd74d6c0e9058cbe2 (diff)
downloadsnowflake-810f1fcc00b5f18811875c12f719a5330fb8edf0.tar.gz
snowflake-810f1fcc00b5f18811875c12f719a5330fb8edf0.zip
Use golang:1.21 container for shadow experiments
-rw-r--r--.gitlab-ci.yml8
1 files changed, 3 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6bbb363..ba4570a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -155,8 +155,7 @@ debian-testing:
- *go-test
shadow-integration:
- # Need golang 1.21 from unstable to build snowflake
- image: debian:sid-slim
+ image: golang:1.21-$DEBIAN_STABLE
variables:
SHADOW_VERSION: "v3.1.0"
TGEN_VERSION: "v1.1.2"
@@ -183,9 +182,8 @@ shadow-integration:
echo "The required version of shadow was not cached, building from source"
git clone --branch $SHADOW_VERSION --depth 1 https://github.com/shadow/shadow.git
pushd shadow/
- CONTAINER=debian:sid-slim ci/container_scripts/install_deps.sh
- CC=gcc CONTAINER=debian:sid-slim ci/container_scripts/install_extra_deps.sh
- apt-get install -y zlib1g
+ CONTAINER=debian:stable-slim ci/container_scripts/install_deps.sh
+ CC=gcc CONTAINER=debian:stable-slim ci/container_scripts/install_extra_deps.sh
export PATH="$HOME/.cargo/bin:${PATH}"
./setup build --jobs $(nproc) --prefix $CI_PROJECT_DIR/opt/
./setup install