From 7638475e3c8a4de3d022524e31de41375a24c4b4 Mon Sep 17 00:00:00 2001 From: Nikola Jokic Date: Fri, 22 May 2026 12:04:06 +0200 Subject: [PATCH] Bump Go to 1.26.3 (#4504) --- Dockerfile | 2 +- go.mod | 4 +-- go.sum | 2 ++ test/e2e/e2e_test.go | 69 ++++++++++++++++++++++++++++---------------- 4 files changed, 49 insertions(+), 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index a11010cf..c7c255a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.26.2 AS builder +FROM --platform=$BUILDPLATFORM golang:1.26.3 AS builder WORKDIR /workspace diff --git a/go.mod b/go.mod index 1611b4b9..4cf62aee 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ module github.com/actions/actions-runner-controller -go 1.26.2 +go 1.26.3 require ( github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.4.0 - github.com/actions/scaleset v0.3.0 + github.com/actions/scaleset v0.4.0 github.com/bradleyfalzon/ghinstallation/v2 v2.18.0 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/evanphx/json-patch v5.9.11+incompatible diff --git a/go.sum b/go.sum index 8b1ad837..8a6ea558 100644 --- a/go.sum +++ b/go.sum @@ -27,6 +27,8 @@ github.com/actions-runner-controller/httpcache v0.2.0 h1:hCNvYuVPJ2xxYBymqBvH0hS github.com/actions-runner-controller/httpcache v0.2.0/go.mod h1:JLu9/2M/btPz1Zu/vTZ71XzukQHn2YeISPmJoM5exBI= github.com/actions/scaleset v0.3.0 h1:y5/ClYLJXFuGCikzILOOPhaCShAcL6K0mnUtjDKFxVw= github.com/actions/scaleset v0.3.0/go.mod h1:2L2I6rggFWV+zprDet6y7y7Vkm3HPudaup78eSc79Uo= +github.com/actions/scaleset v0.4.0 h1:691GC2AkHb3ZGjfNvatboYoRS7CLr3+4VcZk/6w9IbM= +github.com/actions/scaleset v0.4.0/go.mod h1:2L2I6rggFWV+zprDet6y7y7Vkm3HPudaup78eSc79Uo= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/aws/aws-sdk-go-v2 v1.41.3 h1:4kQ/fa22KjDt13QCy1+bYADvdgcxpfH18f0zP542kZA= diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 102d3d60..b56a5749 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -783,26 +783,30 @@ func (e *env) installActionsRunnerController(t *testing.T, repo, tag, testID, ch } if e.useApp { - varEnv = append(varEnv, + varEnv = append( + varEnv, "ACCEPTANCE_TEST_SECRET_TYPE=app", "APP_ID="+e.appID, "APP_INSTALLATION_ID="+e.appInstallationID, "APP_PRIVATE_KEY_FILE="+e.appPrivateKeyFile, ) } else { - varEnv = append(varEnv, + varEnv = append( + varEnv, "ACCEPTANCE_TEST_SECRET_TYPE=token", "GITHUB_TOKEN="+e.githubToken, ) } if e.logFormat != "" { - varEnv = append(varEnv, + varEnv = append( + varEnv, "LOG_FORMAT="+e.logFormat, ) } - varEnv = append(varEnv, + varEnv = append( + varEnv, "GITHUB_WEBHOOK_SERVER_ENV_NAME="+c.GithubWebhookServerEnvName, "GITHUB_WEBHOOK_SERVER_ENV_VALUE="+c.GithubWebhookServerEnvValue, ) @@ -909,20 +913,24 @@ func (e *env) do(t *testing.T, op string, kind DeployKind, testID string, env .. } if e.dockerdWithinRunnerContainer { - varEnv = append(varEnv, + varEnv = append( + varEnv, "RUNNER_DOCKERD_WITHIN_RUNNER_CONTAINER=true", ) if e.rootlessDocker { - varEnv = append(varEnv, + varEnv = append( + varEnv, "RUNNER_NAME="+e.vars.runnerRootlessDindImageRepo, ) } else { - varEnv = append(varEnv, + varEnv = append( + varEnv, "RUNNER_NAME="+e.vars.runnerDindImageRepo, ) } } else { - varEnv = append(varEnv, + varEnv = append( + varEnv, "RUNNER_DOCKERD_WITHIN_RUNNER_CONTAINER=false", "RUNNER_NAME="+e.vars.runnerImageRepo, ) @@ -1062,14 +1070,16 @@ func installActionsWorkflow(t *testing.T, testName, runnerLabel, testResultCMNam if !kubernetesContainerMode { if kind == RunnerDeployments { - steps = append(steps, + steps = append( + steps, testing.Step{ Run: sudo + "mkdir -p \"${RUNNER_TOOL_CACHE}\" \"${HOME}/.cache\"", }, ) if useSudo { - steps = append(steps, + steps = append( + steps, testing.Step{ // This might be the easiest way to handle permissions without use of securityContext // https://stackoverflow.com/questions/50156124/kubernetes-nfs-persistent-volumes-permission-denied#comment107483717_53186320 @@ -1080,7 +1090,8 @@ func installActionsWorkflow(t *testing.T, testName, runnerLabel, testResultCMNam } if useSudo { - steps = append(steps, + steps = append( + steps, testing.Step{ // This might be the easiest way to handle permissions without use of securityContext // https://stackoverflow.com/questions/50156124/kubernetes-nfs-persistent-volumes-permission-denied#comment107483717_53186320 @@ -1102,18 +1113,20 @@ func installActionsWorkflow(t *testing.T, testName, runnerLabel, testResultCMNam ) } - steps = append(steps, + steps = append( + steps, testing.Step{ Uses: "actions/setup-go@v3", With: &testing.With{ - GoVersion: "1.26.1", + GoVersion: "1.26.3", }, }, ) // Ensure both the alias and the full command work after // https://github.com/actions/actions-runner-controller/pull/2326 - steps = append(steps, + steps = append( + steps, testing.Step{ Run: "docker-compose version", }, @@ -1123,7 +1136,8 @@ func installActionsWorkflow(t *testing.T, testName, runnerLabel, testResultCMNam ) } - steps = append(steps, + steps = append( + steps, testing.Step{ Run: "go version", }, @@ -1166,19 +1180,21 @@ func installActionsWorkflow(t *testing.T, testName, runnerLabel, testResultCMNam if useCustomDockerContext { setupBuildXActionWith.Endpoint = "mycontext" - steps = append(steps, testing.Step{ - // https://github.com/docker/buildx/issues/413#issuecomment-710660155 - // To prevent setup-buildx-action from failing with: - // error: could not create a builder instance with TLS data loaded from environment. Please use `docker context create ` to create a context for current environment and then create a builder instance with `docker buildx create ` - Run: "docker context create mycontext", - }, + steps = append( + steps, testing.Step{ + // https://github.com/docker/buildx/issues/413#issuecomment-710660155 + // To prevent setup-buildx-action from failing with: + // error: could not create a builder instance with TLS data loaded from environment. Please use `docker context create ` to create a context for current environment and then create a builder instance with `docker buildx create ` + Run: "docker context create mycontext", + }, testing.Step{ Run: "docker context use mycontext", }, ) } - steps = append(steps, + steps = append( + steps, testing.Step{ Name: "Set up Docker Buildx", Uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2", @@ -1203,7 +1219,8 @@ func installActionsWorkflow(t *testing.T, testName, runnerLabel, testResultCMNam ) if useSudo { - steps = append(steps, + steps = append( + steps, testing.Step{ // https://github.com/docker/build-push-action/blob/master/docs/advanced/cache.md#local-cache // See https://github.com/moby/buildkit/issues/1896 for why this is needed @@ -1218,7 +1235,8 @@ func installActionsWorkflow(t *testing.T, testName, runnerLabel, testResultCMNam if useSudo { if kind == RunnerDeployments { - steps = append(steps, + steps = append( + steps, testing.Step{ // https://github.com/docker/build-push-action/blob/master/docs/advanced/cache.md#local-cache // See https://github.com/moby/buildkit/issues/1896 for why this is needed @@ -1232,7 +1250,8 @@ func installActionsWorkflow(t *testing.T, testName, runnerLabel, testResultCMNam } } - steps = append(steps, + steps = append( + steps, testing.Step{ Uses: "azure/setup-kubectl@3e0aec4d80787158d308d7b364cb1b702e7feb7f", With: &testing.With{