From 3dd110809987b05b4b12352ed2c778208e3e6fd1 Mon Sep 17 00:00:00 2001 From: Wade Simmons Date: Wed, 17 Feb 2021 13:11:57 -0500 Subject: [PATCH] Go 1.16 and darwin-arm64 (#381) This commit switches to Go 1.16 and adds a release binary for darwin-arm64. Fixes: #343 --- .github/workflows/gofmt.yml | 8 ++++---- .github/workflows/release.yml | 23 +++++++++++++++++------ .github/workflows/smoke.yml | 8 ++++---- .github/workflows/test.yml | 16 ++++++++-------- Makefile | 1 + 5 files changed, 34 insertions(+), 22 deletions(-) diff --git a/.github/workflows/gofmt.yml b/.github/workflows/gofmt.yml index b78c517..117fcf2 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.15 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 id: go - name: Check out code into the Go module directory @@ -26,9 +26,9 @@ jobs: - uses: actions/cache@v1 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-gofmt-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-gofmt1.16-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-gofmt- + ${{ runner.os }}-gofmt1.16- - name: Install goimports run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2b899b3..baea456 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.15 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 - name: Checkout code uses: actions/checkout@v2 @@ -34,10 +34,10 @@ jobs: name: Build Windows amd64 runs-on: windows-latest steps: - - name: Set up Go 1.15 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 - name: Checkout code uses: actions/checkout@v2 @@ -58,10 +58,10 @@ jobs: name: Build Darwin amd64 runs-on: macOS-latest steps: - - name: Set up Go 1.15 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 - name: Checkout code uses: actions/checkout@v2 @@ -69,6 +69,7 @@ jobs: - name: Build run: | make BUILD_NUMBER="${GITHUB_REF#refs/tags/v}" service build/nebula-darwin-amd64.tar.gz + make BUILD_NUMBER="${GITHUB_REF#refs/tags/v}" service build/nebula-darwin-arm64.tar.gz mkdir release mv build/*.tar.gz release @@ -159,6 +160,16 @@ jobs: asset_name: nebula-darwin-amd64.tar.gz asset_content_type: application/gzip + - name: Upload darwin-arm64 + uses: actions/upload-release-asset@v1.0.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./darwin-latest/nebula-darwin-arm64.tar.gz + asset_name: nebula-darwin-arm64.tar.gz + asset_content_type: application/gzip + - name: Upload windows-amd64 uses: actions/upload-release-asset@v1.0.1 env: diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml index d734c26..0b2a2f8 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.15 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 id: go - name: Check out code into the Go module directory @@ -30,9 +30,9 @@ jobs: - uses: actions/cache@v1 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-go1.16-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-go- + ${{ runner.os }}-go1.16- - name: build run: make diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c364de8..0962f92 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.15 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 id: go - name: Check out code into the Go module directory @@ -30,9 +30,9 @@ jobs: - uses: actions/cache@v1 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-go1.16-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-go- + ${{ runner.os }}-go1.16- - name: Build run: make all @@ -48,10 +48,10 @@ jobs: os: [windows-latest, macOS-latest] steps: - - name: Set up Go 1.15 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 id: go - name: Check out code into the Go module directory @@ -60,9 +60,9 @@ jobs: - uses: actions/cache@v1 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-go1.16-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-go- + ${{ runner.os }}-go1.16- - name: Build nebula run: go build ./cmd/nebula diff --git a/Makefile b/Makefile index 4d9c92e..df3de7b 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ ALL_LINUX = linux-amd64 \ ALL = $(ALL_LINUX) \ darwin-amd64 \ + darwin-arm64 \ freebsd-amd64 \ windows-amd64