Skip to content

Commit 7638475

Browse files
authored
Bump Go to 1.26.3 (#4504)
1 parent 8ecfbc6 commit 7638475

4 files changed

Lines changed: 49 additions & 28 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM --platform=$BUILDPLATFORM golang:1.26.2 AS builder
2+
FROM --platform=$BUILDPLATFORM golang:1.26.3 AS builder
33

44
WORKDIR /workspace
55

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/actions/actions-runner-controller
22

3-
go 1.26.2
3+
go 1.26.3
44

55
require (
66
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0
77
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1
88
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.4.0
9-
github.com/actions/scaleset v0.3.0
9+
github.com/actions/scaleset v0.4.0
1010
github.com/bradleyfalzon/ghinstallation/v2 v2.18.0
1111
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
1212
github.com/evanphx/json-patch v5.9.11+incompatible

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ github.com/actions-runner-controller/httpcache v0.2.0 h1:hCNvYuVPJ2xxYBymqBvH0hS
2727
github.com/actions-runner-controller/httpcache v0.2.0/go.mod h1:JLu9/2M/btPz1Zu/vTZ71XzukQHn2YeISPmJoM5exBI=
2828
github.com/actions/scaleset v0.3.0 h1:y5/ClYLJXFuGCikzILOOPhaCShAcL6K0mnUtjDKFxVw=
2929
github.com/actions/scaleset v0.3.0/go.mod h1:2L2I6rggFWV+zprDet6y7y7Vkm3HPudaup78eSc79Uo=
30+
github.com/actions/scaleset v0.4.0 h1:691GC2AkHb3ZGjfNvatboYoRS7CLr3+4VcZk/6w9IbM=
31+
github.com/actions/scaleset v0.4.0/go.mod h1:2L2I6rggFWV+zprDet6y7y7Vkm3HPudaup78eSc79Uo=
3032
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
3133
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
3234
github.com/aws/aws-sdk-go-v2 v1.41.3 h1:4kQ/fa22KjDt13QCy1+bYADvdgcxpfH18f0zP542kZA=

test/e2e/e2e_test.go

Lines changed: 44 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -783,26 +783,30 @@ func (e *env) installActionsRunnerController(t *testing.T, repo, tag, testID, ch
783783
}
784784

785785
if e.useApp {
786-
varEnv = append(varEnv,
786+
varEnv = append(
787+
varEnv,
787788
"ACCEPTANCE_TEST_SECRET_TYPE=app",
788789
"APP_ID="+e.appID,
789790
"APP_INSTALLATION_ID="+e.appInstallationID,
790791
"APP_PRIVATE_KEY_FILE="+e.appPrivateKeyFile,
791792
)
792793
} else {
793-
varEnv = append(varEnv,
794+
varEnv = append(
795+
varEnv,
794796
"ACCEPTANCE_TEST_SECRET_TYPE=token",
795797
"GITHUB_TOKEN="+e.githubToken,
796798
)
797799
}
798800

799801
if e.logFormat != "" {
800-
varEnv = append(varEnv,
802+
varEnv = append(
803+
varEnv,
801804
"LOG_FORMAT="+e.logFormat,
802805
)
803806
}
804807

805-
varEnv = append(varEnv,
808+
varEnv = append(
809+
varEnv,
806810
"GITHUB_WEBHOOK_SERVER_ENV_NAME="+c.GithubWebhookServerEnvName,
807811
"GITHUB_WEBHOOK_SERVER_ENV_VALUE="+c.GithubWebhookServerEnvValue,
808812
)
@@ -909,20 +913,24 @@ func (e *env) do(t *testing.T, op string, kind DeployKind, testID string, env ..
909913
}
910914

911915
if e.dockerdWithinRunnerContainer {
912-
varEnv = append(varEnv,
916+
varEnv = append(
917+
varEnv,
913918
"RUNNER_DOCKERD_WITHIN_RUNNER_CONTAINER=true",
914919
)
915920
if e.rootlessDocker {
916-
varEnv = append(varEnv,
921+
varEnv = append(
922+
varEnv,
917923
"RUNNER_NAME="+e.vars.runnerRootlessDindImageRepo,
918924
)
919925
} else {
920-
varEnv = append(varEnv,
926+
varEnv = append(
927+
varEnv,
921928
"RUNNER_NAME="+e.vars.runnerDindImageRepo,
922929
)
923930
}
924931
} else {
925-
varEnv = append(varEnv,
932+
varEnv = append(
933+
varEnv,
926934
"RUNNER_DOCKERD_WITHIN_RUNNER_CONTAINER=false",
927935
"RUNNER_NAME="+e.vars.runnerImageRepo,
928936
)
@@ -1062,14 +1070,16 @@ func installActionsWorkflow(t *testing.T, testName, runnerLabel, testResultCMNam
10621070

10631071
if !kubernetesContainerMode {
10641072
if kind == RunnerDeployments {
1065-
steps = append(steps,
1073+
steps = append(
1074+
steps,
10661075
testing.Step{
10671076
Run: sudo + "mkdir -p \"${RUNNER_TOOL_CACHE}\" \"${HOME}/.cache\"",
10681077
},
10691078
)
10701079

10711080
if useSudo {
1072-
steps = append(steps,
1081+
steps = append(
1082+
steps,
10731083
testing.Step{
10741084
// This might be the easiest way to handle permissions without use of securityContext
10751085
// 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
10801090
}
10811091

10821092
if useSudo {
1083-
steps = append(steps,
1093+
steps = append(
1094+
steps,
10841095
testing.Step{
10851096
// This might be the easiest way to handle permissions without use of securityContext
10861097
// 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
11021113
)
11031114
}
11041115

1105-
steps = append(steps,
1116+
steps = append(
1117+
steps,
11061118
testing.Step{
11071119
Uses: "actions/setup-go@v3",
11081120
With: &testing.With{
1109-
GoVersion: "1.26.1",
1121+
GoVersion: "1.26.3",
11101122
},
11111123
},
11121124
)
11131125

11141126
// Ensure both the alias and the full command work after
11151127
// https://github.com/actions/actions-runner-controller/pull/2326
1116-
steps = append(steps,
1128+
steps = append(
1129+
steps,
11171130
testing.Step{
11181131
Run: "docker-compose version",
11191132
},
@@ -1123,7 +1136,8 @@ func installActionsWorkflow(t *testing.T, testName, runnerLabel, testResultCMNam
11231136
)
11241137
}
11251138

1126-
steps = append(steps,
1139+
steps = append(
1140+
steps,
11271141
testing.Step{
11281142
Run: "go version",
11291143
},
@@ -1166,19 +1180,21 @@ func installActionsWorkflow(t *testing.T, testName, runnerLabel, testResultCMNam
11661180
if useCustomDockerContext {
11671181
setupBuildXActionWith.Endpoint = "mycontext"
11681182

1169-
steps = append(steps, testing.Step{
1170-
// https://github.com/docker/buildx/issues/413#issuecomment-710660155
1171-
// To prevent setup-buildx-action from failing with:
1172-
// error: could not create a builder instance with TLS data loaded from environment. Please use `docker context create <context-name>` to create a context for current environment and then create a builder instance with `docker buildx create <context-name>`
1173-
Run: "docker context create mycontext",
1174-
},
1183+
steps = append(
1184+
steps, testing.Step{
1185+
// https://github.com/docker/buildx/issues/413#issuecomment-710660155
1186+
// To prevent setup-buildx-action from failing with:
1187+
// error: could not create a builder instance with TLS data loaded from environment. Please use `docker context create <context-name>` to create a context for current environment and then create a builder instance with `docker buildx create <context-name>`
1188+
Run: "docker context create mycontext",
1189+
},
11751190
testing.Step{
11761191
Run: "docker context use mycontext",
11771192
},
11781193
)
11791194
}
11801195

1181-
steps = append(steps,
1196+
steps = append(
1197+
steps,
11821198
testing.Step{
11831199
Name: "Set up Docker Buildx",
11841200
Uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2",
@@ -1203,7 +1219,8 @@ func installActionsWorkflow(t *testing.T, testName, runnerLabel, testResultCMNam
12031219
)
12041220

12051221
if useSudo {
1206-
steps = append(steps,
1222+
steps = append(
1223+
steps,
12071224
testing.Step{
12081225
// https://github.com/docker/build-push-action/blob/master/docs/advanced/cache.md#local-cache
12091226
// 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
12181235

12191236
if useSudo {
12201237
if kind == RunnerDeployments {
1221-
steps = append(steps,
1238+
steps = append(
1239+
steps,
12221240
testing.Step{
12231241
// https://github.com/docker/build-push-action/blob/master/docs/advanced/cache.md#local-cache
12241242
// 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
12321250
}
12331251
}
12341252

1235-
steps = append(steps,
1253+
steps = append(
1254+
steps,
12361255
testing.Step{
12371256
Uses: "azure/setup-kubectl@3e0aec4d80787158d308d7b364cb1b702e7feb7f",
12381257
With: &testing.With{

0 commit comments

Comments
 (0)