From 5f7410c80903f6889ab85b3727696300a6d5c727 Mon Sep 17 00:00:00 2001 From: fkwp Date: Wed, 10 Apr 2024 12:46:45 +0000 Subject: [PATCH 1/4] make build_docker job dependent on build_element_call --- .github/workflows/docker-pr.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-pr.yaml b/.github/workflows/docker-pr.yaml index 7d0d3ed1..c8ba32dc 100644 --- a/.github/workflows/docker-pr.yaml +++ b/.github/workflows/docker-pr.yaml @@ -18,6 +18,7 @@ jobs: build_docker: if: ${{ contains(github.event.pull_request.labels.*.name, 'docker build') }} + needs: build_element_call runs-on: ubuntu-latest permissions: deployments: write From fc525a6e45f0ec479563dab34c23b20a080cfa38 Mon Sep 17 00:00:00 2001 From: fkwp Date: Wed, 10 Apr 2024 12:59:32 +0000 Subject: [PATCH 2/4] checkout source -> Dockerfile --- .github/workflows/docker-pr.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker-pr.yaml b/.github/workflows/docker-pr.yaml index c8ba32dc..a7de88d7 100644 --- a/.github/workflows/docker-pr.yaml +++ b/.github/workflows/docker-pr.yaml @@ -23,6 +23,9 @@ jobs: permissions: deployments: write steps: + - name: Check it out + uses: actions/checkout@v4 + - name: 📥 Download artifact uses: actions/download-artifact@v4 with: From 4cc077a72a7670d411039ad2cf88f022fc47ff92 Mon Sep 17 00:00:00 2001 From: fkwp Date: Wed, 10 Apr 2024 14:08:54 +0000 Subject: [PATCH 3/4] typo --- .github/workflows/docker-pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-pr.yaml b/.github/workflows/docker-pr.yaml index a7de88d7..04835bba 100644 --- a/.github/workflows/docker-pr.yaml +++ b/.github/workflows/docker-pr.yaml @@ -30,7 +30,7 @@ jobs: uses: actions/download-artifact@v4 with: github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} - run_id: ${{ github.event.workflow_run.id }} + run-id: ${{ github.event.workflow_run.id }} name: build path: dist From 5bad53c63e77df8124c197c50bf027b3af65f012 Mon Sep 17 00:00:00 2001 From: fkwp Date: Wed, 10 Apr 2024 14:29:59 +0000 Subject: [PATCH 4/4] refactor --- .github/workflows/build_resuable.yaml | 2 +- .github/workflows/docker-pr.yaml | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_resuable.yaml b/.github/workflows/build_resuable.yaml index 258148c6..c13ad958 100644 --- a/.github/workflows/build_resuable.yaml +++ b/.github/workflows/build_resuable.yaml @@ -27,7 +27,7 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: build + name: build-output path: dist # We'll only use this in a triggered job, then we're done with it retention-days: 1 diff --git a/.github/workflows/docker-pr.yaml b/.github/workflows/docker-pr.yaml index 04835bba..309faee5 100644 --- a/.github/workflows/docker-pr.yaml +++ b/.github/workflows/docker-pr.yaml @@ -10,14 +10,20 @@ on: env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} + DO_DOCKER_BUILD: ${{ contains(github.event.pull_request.labels.*.name, 'docker build') }} jobs: build_element_call: - if: ${{ contains(github.event.pull_request.labels.*.name, 'docker build') }} + if: ${{ env.DO_DOCKER_BUILD }} uses: ./.github/workflows/build_resuable.yaml + secrets: + SENTRY_ORG: ${{ secrets.SENTRY_ORG }} + SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }} + SENTRY_URL: ${{ secrets.SENTRY_URL }} + SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} build_docker: - if: ${{ contains(github.event.pull_request.labels.*.name, 'docker build') }} + if: ${{ env.DO_DOCKER_BUILD }} needs: build_element_call runs-on: ubuntu-latest permissions: @@ -29,9 +35,7 @@ jobs: - name: 📥 Download artifact uses: actions/download-artifact@v4 with: - github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} - run-id: ${{ github.event.workflow_run.id }} - name: build + name: build-output path: dist - name: Log in to container registry @@ -48,7 +52,7 @@ jobs: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | type=sha,format=short,event=branch - type=raw,value=pr_${{ github.event.workflow_run.pull_requests[0].number }} + type=raw,value=pr_${{ github.event.pull_request.number }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb