From 8492fd648e05b671b79be7450db9db69be8dadef Mon Sep 17 00:00:00 2001 From: Niek Candaele Date: Mon, 19 Aug 2024 19:53:07 +0200 Subject: [PATCH 1/2] chore: only commit generated api client on develop branch --- .github/workflows/docker.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e6dfe50533..f7c896b861 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -62,7 +62,6 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Login to Github Container Registry - if: ${{ !startsWith(github.actor, 'renovate') }} uses: docker/login-action@v2 with: registry: ghcr.io @@ -78,7 +77,6 @@ jobs: cache-to: type=inline sbom: true file: ${{ matrix.package.dockerfile }} - push: ${{ !startsWith(github.actor, 'renovate') }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} build-args: | @@ -129,7 +127,7 @@ jobs: GRAFANA_CLOUD_API_KEY: ${{ secrets.GRAFANA_CLOUD_API_KEY }} - name: Commit and push if changed - if: github.event_name == 'push' && !contains(github.ref, 'refs/heads/main') && !contains(github.ref, 'refs/heads/development') + if: github.event_name == 'push' && contains(github.ref, 'refs/heads/development') run: | if git diff --quiet; then echo "No changes to commit." From 498c055877ddfce23b5bb0e2588c492c2bb13115 Mon Sep 17 00:00:00 2001 From: Niek Candaele Date: Mon, 19 Aug 2024 20:04:45 +0200 Subject: [PATCH 2/2] fix: always push container --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f7c896b861..9723deb563 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -77,6 +77,7 @@ jobs: cache-to: type=inline sbom: true file: ${{ matrix.package.dockerfile }} + push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} build-args: |