From 6fcb8f646f644bf7d16b78812b2dfe5c9a80d97d Mon Sep 17 00:00:00 2001
From: Earl Warren <earl-warren@noreply.codeberg.org>
Date: Fri, 28 Feb 2025 15:36:13 +0000
Subject: [PATCH] [v10.0/forgejo] chore(ci): Get Go binary from GOROOT instead
of hardcoded path (#7073)
Backport: https://codeberg.org/forgejo/forgejo/pulls/6590
Co-authored-by: fnetX <otto@codeberg.org>
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7073
Reviewed-by: Otto <otto@codeberg.org>
---
.forgejo/workflows-composite/setup-cache-go/action.yaml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.forgejo/workflows-composite/setup-cache-go/action.yaml b/.forgejo/workflows-composite/setup-cache-go/action.yaml
index 1e0425fd0e..cc21485d14 100644
--- a/.forgejo/workflows-composite/setup-cache-go/action.yaml
+++ b/.forgejo/workflows-composite/setup-cache-go/action.yaml
@@ -27,8 +27,9 @@ runs:
- name: "Get go environment information"
id: go-environment
run: |
- echo "modcache=$(su ${RUN_AS_USER} -c '/opt/hostedtoolcache/go/${GO_VERSION}/x64/bin/go env GOMODCACHE')" >> "$GITHUB_OUTPUT"
- echo "cache=$(su ${RUN_AS_USER} -c '/opt/hostedtoolcache/go/${GO_VERSION}/x64/bin/go env GOCACHE')" >> "$GITHUB_OUTPUT"
+ export GOROOT="$(go env GOROOT)"
+ echo "modcache=$(su ${RUN_AS_USER} -c '${GOROOT}/bin/go env GOMODCACHE')" >> "$GITHUB_OUTPUT"
+ echo "cache=$(su ${RUN_AS_USER} -c '${GOROOT}/bin/go env GOCACHE')" >> "$GITHUB_OUTPUT"
env:
RUN_AS_USER: ${{ inputs.username }}
GO_VERSION: ${{ steps.go-version.outputs.go-version }}