From 6d8c5f437cb718f840bad800d16fd67759db54da Mon Sep 17 00:00:00 2001 From: Wade Simmons Date: Tue, 23 May 2023 13:24:33 -0400 Subject: [PATCH] GitHub actions update setup-go (#881) This does caching for us, so we can remove our manual caching of modules --- .github/workflows/gofmt.yml | 17 +++--------- .github/workflows/release.yml | 33 +++++++++++------------ .github/workflows/smoke.yml | 17 +++--------- .github/workflows/test.yml | 51 +++++++++-------------------------- 4 files changed, 35 insertions(+), 83 deletions(-) diff --git a/.github/workflows/gofmt.yml b/.github/workflows/gofmt.yml index e1a49b6..acb3246 100644 --- a/.github/workflows/gofmt.yml +++ b/.github/workflows/gofmt.yml @@ -14,21 +14,12 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up Go 1.20 - uses: actions/setup-go@v2 - with: - go-version: "1.20" - id: go + - uses: actions/checkout@v3 - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - - uses: actions/cache@v2 + - uses: actions/setup-go@v4 with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-gofmt1.20-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-gofmt1.20- + go-version-file: 'go.mod' + check-latest: true - name: Install goimports run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 81203ad..05f9ee6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,13 +10,12 @@ jobs: name: Build Linux All runs-on: ubuntu-latest steps: - - name: Set up Go 1.20 - uses: actions/setup-go@v2 - with: - go-version: "1.20" + - uses: actions/checkout@v3 - - name: Checkout code - uses: actions/checkout@v2 + - uses: actions/setup-go@v4 + with: + go-version-file: 'go.mod' + check-latest: true - name: Build run: | @@ -34,13 +33,12 @@ jobs: name: Build Windows runs-on: windows-latest steps: - - name: Set up Go 1.20 - uses: actions/setup-go@v2 - with: - go-version: "1.20" + - uses: actions/checkout@v3 - - name: Checkout code - uses: actions/checkout@v2 + - uses: actions/setup-go@v4 + with: + go-version-file: 'go.mod' + check-latest: true - name: Build run: | @@ -68,13 +66,12 @@ jobs: HAS_SIGNING_CREDS: ${{ secrets.AC_USERNAME != '' }} runs-on: macos-11 steps: - - name: Set up Go 1.20 - uses: actions/setup-go@v2 - with: - go-version: "1.20" + - uses: actions/checkout@v3 - - name: Checkout code - uses: actions/checkout@v2 + - uses: actions/setup-go@v4 + with: + go-version-file: 'go.mod' + check-latest: true - name: Import certificates if: env.HAS_SIGNING_CREDS == 'true' diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml index e1b1d59..422259b 100644 --- a/.github/workflows/smoke.yml +++ b/.github/workflows/smoke.yml @@ -18,21 +18,12 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up Go 1.20 - uses: actions/setup-go@v2 - with: - go-version: "1.20" - id: go + - uses: actions/checkout@v3 - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - - uses: actions/cache@v2 + - uses: actions/setup-go@v4 with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go1.20- + go-version-file: 'go.mod' + check-latest: true - name: build run: make bin-docker diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 05aff78..1be1590 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,21 +18,12 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up Go 1.20 - uses: actions/setup-go@v2 - with: - go-version: "1.20" - id: go + - uses: actions/checkout@v3 - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - - uses: actions/cache@v2 + - uses: actions/setup-go@v4 with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go1.20- + go-version-file: 'go.mod' + check-latest: true - name: Build run: make all @@ -57,21 +48,12 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up Go 1.20 - uses: actions/setup-go@v2 - with: - go-version: "1.20" - id: go + - uses: actions/checkout@v3 - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - - uses: actions/cache@v2 + - uses: actions/setup-go@v4 with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go1.20- + go-version-file: 'go.mod' + check-latest: true - name: Build run: make bin-boringcrypto @@ -90,21 +72,12 @@ jobs: os: [windows-latest, macos-11] steps: - - name: Set up Go 1.20 - uses: actions/setup-go@v2 - with: - go-version: "1.20" - id: go + - uses: actions/checkout@v3 - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - - uses: actions/cache@v2 + - uses: actions/setup-go@v4 with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go1.20- + go-version-file: 'go.mod' + check-latest: true - name: Build nebula run: go build ./cmd/nebula