Update go-bouncer to build arm64 binaries for macOS and Linux

This also updates the goreleaser install process to use "go install" and
will use version 1.3.1 for goreleaser and updates the Go version used in
the CI to 1.17.6.

Signed-off-by: Dustin Schoenbrun <dustin.schoenbrun@anchore.com>

add more pr events for validations pipeline

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Dustin Schoenbrun <dustin.schoenbrun@anchore.com>

.github/workflows/pipeline.yaml

@@ -2,12 +2,11 @@ name: 'app-pipeline'
 on:
   push:
   pull_request:
-    types: [ opened, reopened ]
 jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.14.x]
+        go-version: [1.17.x]
         platform: [ubuntu-latest, macos-latest] # TODO: add 'windows-latest' support
     runs-on: ${{ matrix.platform }}
     steps:
@@ -44,7 +43,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v1
         with:
-          go-version: '1.14.x'
+          go-version: '1.17.x'
 
       - uses: actions/checkout@v1
 
@@ -76,35 +75,52 @@ jobs:
     needs: [ build-artifacts ]
     runs-on: ubuntu-latest
     steps:
-
       - uses: actions/checkout@master
-
       - uses: actions/download-artifact@master
         with:
           name: artifacts
           path: dist
-
       - name: Test linux run
         run: make ci-test-linux-run
-
       - name: Test docker run
         run: make ci-plugs-out-test
 
+  # test-linux-arm-artifacts:
+  #   needs: [ build-artifacts ]
+  #   runs-on: [ubuntu-latest, ARM64]
+  #   steps:
+  #     - uses: actions/checkout@master
+  #     - uses: actions/download-artifact@master
+  #       with:
+  #         name: artifacts
+  #         path: dist
+  #     - name: Test linux run
+  #       run: make ci-test-linux-arm-run
+
   test-mac-artifacts:
     needs: [ build-artifacts ]
     runs-on: macos-latest
     steps:
-
       - uses: actions/checkout@master
-
       - uses: actions/download-artifact@master
         with:
           name: artifacts
           path: dist
-
       - name: Test darwin run
         run: make ci-test-mac-run
 
+  #  test-mac-arm-artifacts:
+  #    needs: [ build-artifacts ]
+  #    runs-on: [macos-latest, ARM64]
+  #    steps:
+  #      - uses: actions/checkout@master
+  #      - uses: actions/download-artifact@master
+  #        with:
+  #          name: artifacts
+  #          path: dist
+  #      - name: Test darwin run
+  #        run: make ci-test-mac-arm-run
+
   release:
     needs: [ test, build-artifacts, test-linux-artifacts, test-mac-artifacts ] # TODO: add windows support
     runs-on: ubuntu-latest
@@ -113,7 +129,7 @@ jobs:
 
       - uses: actions/setup-go@v1
         with:
-          go-version: '1.14.x'
+          go-version: '1.17.x'
 
       - uses: actions/checkout@v1
 

Makefile

@@ -56,7 +56,7 @@ bootstrap: ## Download and install all project dependencies (+ prep tooling in t
 		tar -xzvf pkger_0.17.0_Linux_x86_64.tar.gz pkger && \
 		mv pkger $(BIN)
 	# install goreleaser
-	curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sh -s -- -b $(BIN) v0.138.0
+	GOBIN=$(BIN) go install github.com/goreleaser/goreleaser@v1.3.1
 
 $(DBASSET):
 	$(call title,Building assets)
@@ -100,24 +100,38 @@ ci-plugs-out-test:
 		-w //src \
 		golang:latest \
 			/bin/bash -x -c "\
-				./dist/go-bouncer_linux_amd64/bouncer version && \
-				./dist/go-bouncer_linux_amd64/bouncer list github.com/wagoodman/go-bouncer && \
-				./dist/go-bouncer_linux_amd64/bouncer check github.com/wagoodman/go-bouncer \
+				./dist/go-bouncer_unix_linux_amd64/bouncer version && \
+				./dist/go-bouncer_unix_linux_amd64/bouncer list github.com/wagoodman/go-bouncer && \
+				./dist/go-bouncer_unix_linux_amd64/bouncer check github.com/wagoodman/go-bouncer \
 			"
 
 ci-test-linux-run:
-	chmod 755 ./dist/go-bouncer_linux_amd64/bouncer && \
-	./dist/go-bouncer_linux_amd64/bouncer version && \
-	./dist/go-bouncer_linux_amd64/bouncer list github.com/wagoodman/go-bouncer
+	chmod 755 ./dist/go-bouncer_unix_linux_amd64/bouncer && \
+	./dist/go-bouncer_unix_linux_amd64/bouncer version && \
+	./dist/go-bouncer_unix_linux_amd64/bouncer list github.com/wagoodman/go-bouncer
+
+ci-test-linux-arm-run:
+	chmod 755 ./dist/go-bouncer_unix_linux_arm64/bouncer && \
+	./dist/go-bouncer_unix_linux_arm64/bouncer version && \
+	./dist/go-bouncer_unix_linux_arm64/bouncer list github.com/wagoodman/go-bouncer
 
 ci-test-mac-run:
-	chmod 755 ./dist/go-bouncer_darwin_amd64/bouncer && \
-	./dist/go-bouncer_darwin_amd64/bouncer version && \
-	./dist/go-bouncer_darwin_amd64/bouncer list github.com/wagoodman/go-bouncer
+	chmod 755 ./dist/go-bouncer_unix_darwin_amd64/bouncer && \
+	./dist/go-bouncer_unix_darwin_amd64/bouncer version && \
+	./dist/go-bouncer_unix_darwin_amd64/bouncer list github.com/wagoodman/go-bouncer
+
+ci-test-mac-arm-run:
+	chmod 755 ./dist/go-bouncer_unix_darwin_arm64/bouncer && \
+	./dist/go-bouncer_unix_darwin_arm64/bouncer version && \
+	./dist/go-bouncer_unix_darwin_arm64/bouncer list github.com/wagoodman/go-bouncer
 
 ci-test-windows-run:
-	./dist/go-bouncer_windows_amd64/bouncer version && \
-	./dist/go-bouncer_windows_amd64/bouncer list github.com/wagoodman/go-bouncer
+	./dist/go-bouncer_windows_windows_amd64/bouncer version && \
+	./dist/go-bouncer_windows_windows_amd64/bouncer list github.com/wagoodman/go-bouncer
 
 ci-release: pkged.go
-	$(BIN)/goreleaser --rm-dist
+	$(BIN)/goreleaser --rm-dist
+
+clean:
+	rm -rf dist
+	rm -rf .tmp

bouncer/licenses/testdata/tags/tags.go

@@ -1,3 +1,4 @@
+//go:build tags
 // +build tags
 
 // Copyright 2019 Google Inc. All Rights Reserved.

goreleaser.yaml

@@ -3,12 +3,23 @@ release:
 
 builds:
   - binary: bouncer
+    id: go-bouncer_unix
     env:
       - CGO_ENABLED=0
     goos:
-      - windows
       - darwin
       - linux
+    goarch:
+      - amd64
+      - arm64
+    ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.buildTime={{.Date}}`.
+
+  - binary: bouncer
+    id: go-bouncer_windows
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - windows
     goarch:
       - amd64
     ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.buildTime={{.Date}}`.

tools.go

@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 package main