From fe81d1350f264183ecbba0ca9533efcc4e4836ff Mon Sep 17 00:00:00 2001 From: sbruens Date: Mon, 9 Sep 2024 17:01:33 -0400 Subject: [PATCH 1/2] chore: support Go workspaces --- .github/workflows/go.yml | 2 +- .gitignore | 4 ++++ .goreleaser.yml | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 24822c5e..e05d7899 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -46,7 +46,7 @@ jobs: git submodule update --init - name: Build - run: go build -v ./... + run: GOWORK=off go build -v ./... - name: Test run: go test -race -benchmem -bench=. ./... -benchtime=100ms diff --git a/.gitignore b/.gitignore index 82e9d403..7fc155d1 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,7 @@ # Go task /.task/ + +# Go workspace +go.work +go.work.sum diff --git a/.goreleaser.yml b/.goreleaser.yml index 29842233..b07a73b4 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -21,6 +21,7 @@ builds: main: ./cmd/outline-ss-server env: - CGO_ENABLED=0 + - GOWORK=off goos: - darwin - windows From d57ccdccb630bf344737c70223107e61a65d93de Mon Sep 17 00:00:00 2001 From: sbruens Date: Tue, 10 Sep 2024 11:32:04 -0400 Subject: [PATCH 2/2] Re-enable workspaces on CI based on review comments. --- .github/workflows/go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index e05d7899..24822c5e 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -46,7 +46,7 @@ jobs: git submodule update --init - name: Build - run: GOWORK=off go build -v ./... + run: go build -v ./... - name: Test run: go test -race -benchmem -bench=. ./... -benchtime=100ms