From 2d8f37b1dbbd963954dcc28ef836bab8ff33f2f6 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Mon, 22 Jan 2024 17:16:31 +0100 Subject: [PATCH 1/2] ghactions: Don't upload artifacts multiple times With the addition of a matrix of go versions to test the build with, the artifact upload will also be run multiple time. If they run concurrently, this will cause unexpected upload failures. Only publish the '1.21.x' artifact. Signed-off-by: Christophe Fergeau --- .github/workflows/go.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index f45b41833..9f1ce35f9 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -29,6 +29,7 @@ jobs: mv bin/gvproxy.exe bin/gvproxy-windowsgui.exe - uses: actions/upload-artifact@v3 + if: ${{ matrix.go-version }} == '1.21.x' with: name: gvisor-tap-vsock-binaries path: bin/* From f6d51e6c387ec56fa831f079b62b652e1552e61a Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Thu, 25 Jan 2024 12:25:17 +0100 Subject: [PATCH 2/2] test: Increase `go test` timeout This may help with the failures we are seeing in github actions. Signed-off-by: Christophe Fergeau --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fb0118e93..00f2c082f 100644 --- a/Makefile +++ b/Makefile @@ -66,4 +66,4 @@ test-companion: .PHONY: test test: gvproxy test-companion - go test -v ./... + go test -timeout 20m -v ./...