From 2491bbfa69a78ac55ca0868d08fa4f798106c7d9 Mon Sep 17 00:00:00 2001 From: forgejo-backport-action Date: Thu, 6 Feb 2025 08:15:36 +0000 Subject: [PATCH] [v10.0/forgejo] ci: fix go version check (#6810) **Backport:** https://codeberg.org/forgejo/forgejo/pulls/6646 Allow ci go version to be higher than the tool chain. This will fix the current build issues on forgejo branch Co-authored-by: Michael Kriese Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6810 Reviewed-by: Michael Kriese Co-authored-by: forgejo-backport-action Co-committed-by: forgejo-backport-action --- .forgejo/workflows-composite/setup-env/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows-composite/setup-env/action.yaml b/.forgejo/workflows-composite/setup-env/action.yaml index 28216e9b8d..f19569a137 100644 --- a/.forgejo/workflows-composite/setup-env/action.yaml +++ b/.forgejo/workflows-composite/setup-env/action.yaml @@ -19,7 +19,7 @@ runs: set -ex toolchain=$(grep -oP '(?<=toolchain ).+' go.mod) version=$(go version | cut -d' ' -f3) - if [ "$toolchain" != "$version" ]; then - echo "go version mismatch: $toolchain <> $version" + if dpkg --compare-versions ${version#go} lt ${toolchain#go}; then + echo "go version too low: $toolchain >= $version" exit 1 fi