From 3fd54a0f62ca7891ef4c2b83906c6879808afbfc Mon Sep 17 00:00:00 2001 From: lgtm <1gtm@users.noreply.github.com> Date: Thu, 6 Feb 2025 22:31:20 -0800 Subject: [PATCH] Disable image caching in setup-qemu action (#406) Signed-off-by: 1gtm <1gtm@appscode.com> --- .github/workflows/ci.yml | 2 ++ .github/workflows/release.yml | 2 ++ Makefile | 2 +- auth/providers/azure/pop_tokenverifier.go | 1 - 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df74a9d7..070affb3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,8 @@ jobs: - name: Set up QEMU id: qemu uses: docker/setup-qemu-action@v3 + with: + cache-image: false - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 43d4d79e..5a1a4185 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,6 +24,8 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v3 + with: + cache-image: false - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/Makefile b/Makefile index 878aa909..c418f59a 100644 --- a/Makefile +++ b/Makefile @@ -322,7 +322,7 @@ lint: $(BUILD_DIRS) --env GO111MODULE=on \ --env GOFLAGS="-mod=vendor" \ $(BUILD_IMAGE) \ - golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --skip-files="generated.*\.go$\" --skip-dirs-use-default --skip-dirs=client,vendor + golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default --exclude-dirs=client,vendor $(BUILD_DIRS): @mkdir -p $@ diff --git a/auth/providers/azure/pop_tokenverifier.go b/auth/providers/azure/pop_tokenverifier.go index 90a67007..d123f5dd 100644 --- a/auth/providers/azure/pop_tokenverifier.go +++ b/auth/providers/azure/pop_tokenverifier.go @@ -205,7 +205,6 @@ func (p *PoPTokenVerifier) ValidatePopToken(token string) (string, error) { return "", errors.Errorf("Failed to write message to hasher. Error:%+v", err) } err = rsa.VerifyPKCS1v15(publicKey, crypto.SHA256, hasher.Sum(nil), signature) - if err != nil { return "", errors.Errorf("RSA verify err: %+v", err) }