summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrystal <crystal@noreply.codeberg.org>2024-01-09 18:27:35 -0700
committercrystal <crystal@noreply.codeberg.org>2024-01-09 18:27:35 -0700
commit3e65e083a0533c2d9930fdf9d9382285e9a1607b (patch)
tree4fba175afd77954fe97c8ddc42f6c0472414c9ca
parent9d8dc1b1d8293e513c53891cf417dcadee8e8591 (diff)
Use golang 1.21 for forgejo-test-deps
-rwxr-xr-x.ci-make.sh4
-rw-r--r--.crystalintegration.yml2
2 files changed, 4 insertions, 2 deletions
diff --git a/.ci-make.sh b/.ci-make.sh
index 6155b73..dc4ecee 100755
--- a/.ci-make.sh
+++ b/.ci-make.sh
@@ -149,8 +149,8 @@ case "$1" in
export DEBIAN_FRONTEND=noninteractive
apt update -qq
apt install -qq --no-install-recommends -y git-lfs
- apt install -qq -y -t bookworm-backports golang-1.20
- ln -sf /usr/lib/go-1.20/bin/go /usr/local/bin/go
+ apt install -qq -y -t bookworm-backports golang-$DEP_GOLANG_VER
+ ln -sf /usr/lib/go-$DEP_GOLANG_VER/bin/go /usr/local/bin/go
adduser --quiet --comment forgejo --disabled-password forgejo
chown -R forgejo:forgejo .
;;
diff --git a/.crystalintegration.yml b/.crystalintegration.yml
index 3e25a30..ad494bc 100644
--- a/.crystalintegration.yml
+++ b/.crystalintegration.yml
@@ -18,6 +18,7 @@ variables:
- &deb_test_image_focal 'sc.cryxtal.org/ci-img/deb-test-ubuntu:focal'
- &deb_test_image_kinetic 'sc.cryxtal.org/ci-img/deb-test-ubuntu:kinetic'
- &deb_test_image_lunar 'sc.cryxtal.org/ci-img/deb-test-ubuntu:lunar'
+ - &forgejo_test_golang_ver '1.21'
- &build_submodule 'forgejo'
- &goproxy_override ''
- &goproxy_setup |-
@@ -104,6 +105,7 @@ steps:
group: checks
environment:
GOPROXY_OVERRIDE: *goproxy_override
+ DEP_GOLANG_VER: *forgejo_test_golang_ver
secrets:
- goproxy_default
commands: