From 337591b2bb9d2301414388633b687c3b0c0dcb8d Mon Sep 17 00:00:00 2001 From: Sudarsan Reddy Date: Fri, 17 Jun 2022 09:23:44 +0100 Subject: [PATCH] TUN-6414: Remove go-sumtype from cloudflared build process This PR removes go-sumtype from cloudflared's build processes. The value we see from analysing exhaustive match patterns in go is minimal (we can do this in code reviews) compared to using a tool that is unmaintained and (now broken) in Go 1.18. We'd already been using the patched version here: https://github.com/sudarshan-reddy/go-sumtype because the original is broken for go tools > 1.16 --- .github/workflows/check.yaml | 2 -- Makefile | 5 ----- cfsetup.yaml | 1 - 3 files changed, 8 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 6a3423c7..aa61d4d6 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -12,8 +12,6 @@ jobs: uses: actions/setup-go@v2 with: go-version: ${{ matrix.go-version }} - - name: Install go-sumtype - run: go get github.com/sudarshan-reddy/go-sumtype - name: Checkout code uses: actions/checkout@v2 - name: Test diff --git a/Makefile b/Makefile index bfd64cf5..0b103775 100644 --- a/Makefile +++ b/Makefile @@ -293,11 +293,6 @@ quic-deps: .PHONY: vet vet: go vet -mod=vendor ./... - # go get github.com/sudarshan-reddy/go-sumtype (don't do this in build directory or this will cause vendor issues) - # Note: If you have github.com/BurntSushi/go-sumtype then you might have to use the repo above instead - # for now because it uses an older version of golang.org/x/tools. - which go-sumtype - go-sumtype $$(go list -mod=vendor ./...) .PHONY: goimports goimports: diff --git a/cfsetup.yaml b/cfsetup.yaml index 3f546135..130f6bbe 100644 --- a/cfsetup.yaml +++ b/cfsetup.yaml @@ -153,7 +153,6 @@ stretch: &stretch - gotest-to-teamcity pre-cache: &test_pre_cache - go get golang.org/x/tools/cmd/goimports - - go get github.com/sudarshan-reddy/go-sumtype@v0.0.0-20210827105221-82eca7e5abb1 post-cache: - export GOOS=linux - export GOARCH=amd64