From 6cc37f093cec189e64651599cb98ee3db97540ab Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Wed, 21 Feb 2024 10:59:45 -0800 Subject: [PATCH] Remove GOROOT=/usr/lib/golang hack (#148) Supposedly this was fixed in the mariner go packages (though I've not verified that). In any case, I believe the main reason the bug in the packages was exposed was due to the way the mariner toolkit was executing the package builds. This is no longer a problem for us, so removing these. Signed-off-by: Brian Goff --- docs/examples/go-md2man-1.yml | 1 - docs/examples/go-md2man-2.yml | 1 - docs/intro.md | 2 -- test/fixtures/frontend.yml | 1 - test/fixtures/moby-runc.yml | 2 -- 5 files changed, 7 deletions(-) diff --git a/docs/examples/go-md2man-1.yml b/docs/examples/go-md2man-1.yml index db3b8a2b5..4142df3a3 100644 --- a/docs/examples/go-md2man-1.yml +++ b/docs/examples/go-md2man-1.yml @@ -19,7 +19,6 @@ dependencies: build: env: - GOROOT: /usr/lib/golang # Note: This is needed due to a bug in the golang package for mariner CGO_ENABLED: "0" steps: - command: | diff --git a/docs/examples/go-md2man-2.yml b/docs/examples/go-md2man-2.yml index a20a63564..771dd23fd 100644 --- a/docs/examples/go-md2man-2.yml +++ b/docs/examples/go-md2man-2.yml @@ -37,7 +37,6 @@ dependencies: build: env: - GOROOT: /usr/lib/golang # Note: This is needed due to a bug in the golang package for mariner CGO_ENABLED: "0" steps: - command: | diff --git a/docs/intro.md b/docs/intro.md index 807edf3fd..064e49d94 100644 --- a/docs/intro.md +++ b/docs/intro.md @@ -148,7 +148,6 @@ dependencies: build: env: - GOROOT: /usr/lib/golang # Note: This is needed due to a bug in the golang package for mariner CGO_ENABLED: "0" steps: - command: | @@ -231,7 +230,6 @@ dependencies: build: env: - GOROOT: /usr/lib/golang # Note: This is needed due to a bug in the golang package for mariner CGO_ENABLED: "0" steps: - command: | diff --git a/test/fixtures/frontend.yml b/test/fixtures/frontend.yml index 1415e4273..ebe51cd07 100644 --- a/test/fixtures/frontend.yml +++ b/test/fixtures/frontend.yml @@ -38,7 +38,6 @@ build: GOGC: off GOFLAGS: -trimpath GOPATH: /go - GOROOT: /usr/lib/golang steps: - command: | export GOMODCACHE="$(pwd)/gomodcache" diff --git a/test/fixtures/moby-runc.yml b/test/fixtures/moby-runc.yml index d6600de30..0b68f6cd0 100644 --- a/test/fixtures/moby-runc.yml +++ b/test/fixtures/moby-runc.yml @@ -70,12 +70,10 @@ build: CGO_ENABLED: 1 GOGC: off GOFLAGS: -trimpath - GOROOT: /usr/lib/golang steps: - command: | set -e cd src - export GOROOT=/usr/lib/golang make man runc BUILDTAGS=seccomp artifacts: binaries: