From 4dd15d6f3d059412567042938b3cdd81eb4c9176 Mon Sep 17 00:00:00 2001 From: Fred Heinecke Date: Thu, 12 Dec 2024 16:19:07 -0600 Subject: [PATCH 1/2] Remove CI-specific UID/GID to appease GH's breaking change Signed-off-by: Fred Heinecke --- build.assets/Makefile | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/build.assets/Makefile b/build.assets/Makefile index ecb0f7674c3f4..b2e7f7282dcc5 100644 --- a/build.assets/Makefile +++ b/build.assets/Makefile @@ -37,17 +37,6 @@ endif # conditionally force the use of UID/GID 1000:1000 if we're running in Github Actions (in which case CI env var will be set) ifeq ("$(CI)","true") -# The UID/GID of the runner user on ARC runners is 1001, not 1000 -# This var is currently only set for ARC runners via https://github.com/gravitational/cloud-terraform/pull/2473 -ifeq ("$(CI_SYSTEM)","ARC") -UID := 1001 -GID := 1001 -NOROOT := -u 1001:1001 -else -UID := 1000 -GID := 1000 -NOROOT := -u 1000:1000 -endif # if running in CI and the GOCACHE environment variable is not set, set it to a sensible default ifeq ("$(GOCACHE)",) GOCACHE := /go/cache From 74a4b3aa9b8b73baf6bbf0de541ec97815c9f874 Mon Sep 17 00:00:00 2001 From: Fred Heinecke Date: Thu, 12 Dec 2024 16:34:10 -0600 Subject: [PATCH 2/2] rm comment Signed-off-by: Fred Heinecke --- build.assets/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/build.assets/Makefile b/build.assets/Makefile index b2e7f7282dcc5..21e40af91d59e 100644 --- a/build.assets/Makefile +++ b/build.assets/Makefile @@ -35,7 +35,6 @@ ifneq ("$(KUBECONFIG)","") DOCKERFLAGS := $(DOCKERFLAGS) -v $(KUBECONFIG):/mnt/kube/config -e KUBECONFIG=/mnt/kube/config -e TEST_KUBE=$(TEST_KUBE) endif -# conditionally force the use of UID/GID 1000:1000 if we're running in Github Actions (in which case CI env var will be set) ifeq ("$(CI)","true") # if running in CI and the GOCACHE environment variable is not set, set it to a sensible default ifeq ("$(GOCACHE)",)