Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove CI-specific UID/GID to appease GH's breaking change #50176

Merged
merged 2 commits into from
Dec 12, 2024
+0 −12
Merged

Remove CI-specific UID/GID to appease GH's breaking change #50176

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dd15d6
Remove CI-specific UID/GID to appease GH's breaking change
fheinecke Dec 12, 2024
74a4b3a
rm comment
fheinecke Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions build.assets/Makefile
View file
Open in desktop
Copy link
Member

@ravicious ravicious Dec 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this might've broken TestRootX11ForwardPermissions on v15. It failed for me twice in a row.

    sshserver_test.go:1098: 
        	Error Trace:	/__w/teleport/teleport/lib/srv/regular/sshserver_test.go:1098
        	Error:      	Received unexpected error:
        	            	user: unknown userid 1000
        	Test:       	TestRootX11ForwardPermissions

https://github.com/gravitational/teleport/actions/runs/12315623784/job/34374219868#step:6:1942
https://github.com/gravitational/teleport/actions/runs/12315086928/job/34372541318#step:6:1943
#49992

Original file line number Diff line number Diff line change
Expand Up @@ -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)
camscale marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down
Loading