diff --git a/.github/workflows/gofmt.yml b/.github/workflows/gofmt.yml index a00453b..e1a49b6 100644 --- a/.github/workflows/gofmt.yml +++ b/.github/workflows/gofmt.yml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up Go 1.19 + - name: Set up Go 1.20 uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: "1.20" id: go - name: Check out code into the Go module directory @@ -26,19 +26,18 @@ jobs: - uses: actions/cache@v2 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-gofmt1.19-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-gofmt1.20-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-gofmt1.19- + ${{ runner.os }}-gofmt1.20- - name: Install goimports run: | - go get golang.org/x/tools/cmd/goimports - go build golang.org/x/tools/cmd/goimports + go install golang.org/x/tools/cmd/goimports@latest - name: gofmt run: | - if [ "$(find . -iname '*.go' | grep -v '\.pb\.go$' | xargs ./goimports -l)" ] + if [ "$(find . -iname '*.go' | grep -v '\.pb\.go$' | xargs goimports -l)" ] then - find . -iname '*.go' | grep -v '\.pb\.go$' | xargs ./goimports -d + find . -iname '*.go' | grep -v '\.pb\.go$' | xargs goimports -d exit 1 fi diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 572b0ff..81203ad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,10 +10,10 @@ jobs: name: Build Linux All runs-on: ubuntu-latest steps: - - name: Set up Go 1.19 + - name: Set up Go 1.20 uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: "1.20" - name: Checkout code uses: actions/checkout@v2 @@ -34,10 +34,10 @@ jobs: name: Build Windows runs-on: windows-latest steps: - - name: Set up Go 1.19 + - name: Set up Go 1.20 uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: "1.20" - name: Checkout code uses: actions/checkout@v2 @@ -68,10 +68,10 @@ jobs: HAS_SIGNING_CREDS: ${{ secrets.AC_USERNAME != '' }} runs-on: macos-11 steps: - - name: Set up Go 1.19 + - name: Set up Go 1.20 uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: "1.20" - name: Checkout code uses: actions/checkout@v2 diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml index 162d526..18a62f1 100644 --- a/.github/workflows/smoke.yml +++ b/.github/workflows/smoke.yml @@ -18,10 +18,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up Go 1.19 + - name: Set up Go 1.20 uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: "1.20" id: go - name: Check out code into the Go module directory @@ -30,9 +30,9 @@ jobs: - uses: actions/cache@v2 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-go1.19-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-go1.19- + ${{ runner.os }}-go1.20- - name: build run: make bin-docker diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9290aa7..71e68ab 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,10 +18,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up Go 1.19 + - name: Set up Go 1.20 uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: "1.20" id: go - name: Check out code into the Go module directory @@ -30,9 +30,9 @@ jobs: - uses: actions/cache@v2 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-go1.19-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-go1.19- + ${{ runner.os }}-go1.20- - name: Build run: make all @@ -60,10 +60,10 @@ jobs: os: [windows-latest, macos-11] steps: - - name: Set up Go 1.19 + - name: Set up Go 1.20 uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: "1.20" id: go - name: Check out code into the Go module directory @@ -72,9 +72,9 @@ jobs: - uses: actions/cache@v2 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-go1.19-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-go1.19- + ${{ runner.os }}-go1.20- - name: Build nebula run: go build ./cmd/nebula diff --git a/Makefile b/Makefile index b31c0fc..d5618bc 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -GOMINVERSION = 1.19 +GOMINVERSION = 1.20 NEBULA_CMD_PATH = "./cmd/nebula" GO111MODULE = on export GO111MODULE diff --git a/go.mod b/go.mod index ea42666..7c55c30 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/slackhq/nebula -go 1.19 +go 1.20 require ( github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be