From 6ad565bb6bd48214cd05beeadc63b1318b00e8c9 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Wed, 28 Jul 2021 09:56:58 +0200 Subject: [PATCH] chore(actions): trigger rebuild to get rid of the broken GH cache (#2083) * chore(actions): trigger rebuild to get rid of the broken GH cache * Update zitadel.yml * invalidate cache * update action * simplify caching scopes * use mode max * Update zitadel.yml --- .github/workflows/zitadel.yml | 44 ++++++++++++++--------------------- console/README.md | 1 - 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/.github/workflows/zitadel.yml b/.github/workflows/zitadel.yml index 6dd9bf6d2d..476959d51e 100644 --- a/.github/workflows/zitadel.yml +++ b/.github/workflows/zitadel.yml @@ -65,16 +65,15 @@ jobs: uses: docker/setup-buildx-action@v1 with: ## Workaround until https://github.com/docker/build-push-action/issues/252#issuecomment-804898823 is merged - version: v0.6.0-rc1 - driver-opts: image=moby/buildkit:master + version: v0.6.0 buildkitd-flags: --debug - uses: docker/build-push-action@v2 with: context: . file: ./build/zitadel/Dockerfile platforms: linux/amd64 - cache-from: type=gha,scope=zitadel - cache-to: type=gha,mode=max,scope=zitadel + cache-from: type=gha,scope=${{ github.workflow }} + cache-to: type=gha,scope=${{ github.workflow }} outputs: type=local,dest=/tmp/zitadel - uses: actions/upload-artifact@v2 with: @@ -92,8 +91,7 @@ jobs: uses: docker/setup-buildx-action@v1 with: ## Workaround until https://github.com/docker/build-push-action/issues/252#issuecomment-804898823 is merged - version: v0.6.0-rc1 - driver-opts: image=moby/buildkit:master + version: v0.6.0 buildkitd-flags: --debug - uses: docker/build-push-action@v2 with: @@ -101,7 +99,7 @@ jobs: file: ./build/zitadel/Dockerfile platforms: linux/amd64 target: go-codecov - cache-from: type=gha,scope=zitadel + cache-from: type=gha,scope=${{ github.workflow }} outputs: type=local,dest=/tmp/zitadel - uses: codecov/codecov-action@v1 with: @@ -119,16 +117,15 @@ jobs: uses: docker/setup-buildx-action@v1 with: ## Workaround until https://github.com/docker/build-push-action/issues/252#issuecomment-804898823 is merged - version: v0.6.0-rc1 - driver-opts: image=moby/buildkit:master + version: v0.6.0 buildkitd-flags: --debug - uses: docker/build-push-action@v2 with: context: . file: ./build/console/Dockerfile platforms: linux/amd64 - cache-from: type=gha,scope=zitadel-console - cache-to: type=gha,mode=max,scope=zitadel-console + #cache-from: type=gha,scope=${{ github.workflow }} + cache-to: type=gha,scope=${{ github.workflow }},mode=max outputs: type=local,dest=/tmp/zitadel-console - uses: actions/upload-artifact@v2 with: @@ -155,8 +152,7 @@ jobs: uses: docker/setup-buildx-action@v1 with: ## Workaround until https://github.com/docker/build-push-action/issues/252#issuecomment-804898823 is merged - version: v0.6.0-rc1 - driver-opts: image=moby/buildkit:master + version: v0.6.0 buildkitd-flags: --debug - name: Login to DockerHub uses: docker/login-action@v1 @@ -171,8 +167,8 @@ jobs: platforms: linux/amd64 tags: ${{ env.REGISTRY }}/${{ github.repository }}:${{ needs.refs.outputs.sha_short }},${{ env.REGISTRY }}/${{ github.repository }}:${{ needs.refs.outputs.short_ref }} push: true - cache-from: type=gha,scope=zitadel-image - cache-to: type=gha,mode=max,scope=zitadel-image + cache-from: type=gha,scope=${{ github.workflow }} + cache-to: type=gha,scope=${{ github.workflow }},mode=max zitadel-operator: name: Build ZITADEL Operator ${{ matrix.goos }}-${{ matrix.goarch }} @@ -191,8 +187,7 @@ jobs: uses: docker/setup-buildx-action@v1 with: ## Workaround until https://github.com/docker/build-push-action/issues/252#issuecomment-804898823 is merged - version: v0.6.0-rc1 - driver-opts: image=moby/buildkit:master + version: v0.6.0 buildkitd-flags: --debug - uses: docker/build-push-action@v2 with: @@ -200,7 +195,7 @@ jobs: file: ./build/operator/Dockerfile platforms: linux/amd64 cache-from: type=gha,scope=${{ matrix.goos }}-${{ matrix.goarch }} - cache-to: type=gha,mode=max,scope=${{ matrix.goos }}-${{ matrix.goarch }} + cache-to: type=gha,scope=${{ matrix.goos }}-${{ matrix.goarch }},mode=max outputs: type=local,dest=/tmp/operator build-args: | OS=${{ matrix.goos }} @@ -233,8 +228,7 @@ jobs: uses: docker/setup-buildx-action@v1 with: ## Workaround until https://github.com/docker/build-push-action/issues/252#issuecomment-804898823 is merged - version: v0.6.0-rc1 - driver-opts: image=moby/buildkit:master + version: v0.6.0 buildkitd-flags: --debug - uses: docker/build-push-action@v2 with: @@ -267,8 +261,7 @@ jobs: uses: docker/setup-buildx-action@v1 with: ## Workaround until https://github.com/docker/build-push-action/issues/252#issuecomment-804898823 is merged - version: v0.6.0-rc1 - driver-opts: image=moby/buildkit:master + version: v0.6.0 buildkitd-flags: --debug - name: Login to DockerHub uses: docker/login-action@v1 @@ -303,8 +296,7 @@ jobs: uses: docker/setup-buildx-action@v1 with: ## Workaround until https://github.com/docker/build-push-action/issues/252#issuecomment-804898823 is merged - version: v0.6.0-rc1 - driver-opts: image=moby/buildkit:master + version: v0.6.0 buildkitd-flags: --debug - name: Login to DockerHub uses: docker/login-action@v1 @@ -320,8 +312,8 @@ jobs: platforms: linux/amd64 tags: ${{ env.REGISTRY }}/${{ env.CRDB_IMAGE_NAME }}:${{ needs.refs.outputs.sha_short }},${{ env.REGISTRY }}/${{ env.CRDB_IMAGE_NAME }}:${{ needs.refs.outputs.short_ref }} push: true - cache-from: type=gha,scope=zitadel-cockroachdb - cache-to: type=gha,mode=max,scope=zitadel-cockroachdb + cache-from: type=gha,scope=${{ github.workflow }} + cache-to: type=gha,scope=${{ github.workflow }} release: name: Semantic Release Images and Artifacts diff --git a/console/README.md b/console/README.md index 21b4233649..5c9edcd5f9 100644 --- a/console/README.md +++ b/console/README.md @@ -25,4 +25,3 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac ## Further help To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). -