From ec2b46cea3c79e4062337fc8f03d50284b7ebe71 Mon Sep 17 00:00:00 2001
From: Ignasi Barrera <ignasi@tetrate.io>
Date: Fri, 9 Feb 2024 17:09:03 +0100
Subject: [PATCH] CI fixes

---
 .github/workflows/ci.yaml      | 40 +++++++++++++++++++---------------
 .github/workflows/publish.yaml |  4 ++--
 Makefile                       |  3 +--
 README.md                      |  2 +-
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 241b796..31f47c6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -18,11 +18,11 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GOVERSION }}
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build
@@ -36,11 +36,11 @@ jobs:
     needs: check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GOVERSION }}
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build
@@ -54,11 +54,11 @@ jobs:
     needs: check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GOVERSION }}
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build
@@ -74,11 +74,11 @@ jobs:
     env:
       LINT_OPTS: "--timeout 10m"
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GOVERSION }}
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build
@@ -92,11 +92,11 @@ jobs:
     needs: check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GOVERSION }}
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build
@@ -113,11 +113,15 @@ jobs:
     needs: check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: docker/setup-qemu-action@v2
+        with:
+          platforms: amd64,arm64
+      - uses: docker/setup-buildx-action@v2
+      - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GOVERSION }}
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index a232b3c..90fe5a2 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -20,10 +20,10 @@ jobs:
           # Set the RELEASE_TAG to force the version of the Docker images
           echo "DOCKER_TAG=${GITHUB_REF_NAME}" >> "$GITHUB_ENV"
 
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GOVERSION }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: google-github-actions/auth@v1
         with:
           credentials_json: ${{ secrets.GCP_INTERNAL_CONTAINERS_SERVICE_ACCOUNT_KEY }}
diff --git a/Makefile b/Makefile
index 48b4fc1..db44f38 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,6 @@ config/lint:  ## Lint the Config Proto generated code
 test:  ## Run all the tests
 	@go test $(TEST_OPTS) $(TEST_PKGS)
 
-COVERAGE_PACKAGES ?= $(shell go list ./...)
 COVERAGE_OPTS     ?=
 .PHONY: coverage
 coverage:  ## Creates coverage report for all projects
@@ -112,7 +111,7 @@ coverage:  ## Creates coverage report for all projects
 		-timeout 30s \
 		-coverprofile $(OUTDIR)/$@/coverage.out \
 		-covermode atomic \
-		$(COVERAGE_PACKAGES)
+		$(TEST_PKGS)
 	@go tool cover -html="$(OUTDIR)/$@/coverage.out" -o "$(OUTDIR)/$@/coverage.html"
 
 .PHONY: e2e
diff --git a/README.md b/README.md
index 3e7b521..2aec93e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # authservice
 
 [![CI](https://github.com/tetrateio/authzervice-go/actions/workflows/ci.yaml/badge.svg)](https://github.com/tetrateio/authzervice-go/actions/workflows/ci.yaml)
-[![codecov](https://codecov.io/gh/tetrateio/authzervice-go/graph/badge.svg?token=LAmdH59zeK)](https://codecov.io/gh/tetrateio/authzervice-go)
+[![codecov](https://codecov.io/gh/tetrateio/authservice-go/graph/badge.svg?token=JTLsQloZo9)](https://codecov.io/gh/tetrateio/authservice-go)
 
 An implementation of [Envoy](https://envoyproxy.io) [External Authorization](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/ext_authz_filter),
 focused on delivering authN/Z solutions for [Istio](https://istio.io) and [Kubernetes](https://kubernetes.io).