From 8cad26cc5176aca89b4517ea2a406ff7b37cce21 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Thu, 30 May 2024 11:09:21 +0300 Subject: [PATCH 1/4] ci: builld base image on PRs This will prevent events like #13407 in future. @ammario @kylecarbs, we should probably also mark this as a required workflow. --- .github/workflows/docker-base.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-base.yaml b/.github/workflows/docker-base.yaml index c88bea3ef182a..97394456e5179 100644 --- a/.github/workflows/docker-base.yaml +++ b/.github/workflows/docker-base.yaml @@ -7,6 +7,10 @@ on: paths: - scripts/Dockerfile.base - scripts/Dockerfile + + pull_request: + paths: + - scripts/Dockerfile.base schedule: # Run every week at 09:43 on Monday, Wednesday and Friday. We build this From 5e05a5e73131981ba89608641685d026f0787065 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Thu, 30 May 2024 11:14:33 +0300 Subject: [PATCH 2/4] fixup! Do not push on `pull_request` --- .github/workflows/docker-base.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-base.yaml b/.github/workflows/docker-base.yaml index 97394456e5179..88d34e01cef9a 100644 --- a/.github/workflows/docker-base.yaml +++ b/.github/workflows/docker-base.yaml @@ -61,7 +61,7 @@ jobs: platforms: linux/amd64,linux/arm64,linux/arm/v7 pull: true no-cache: true - push: true + push: github.event_name != 'pull_request' tags: | ghcr.io/coder/coder-base:latest From 585eba16488a5d5882ded15ea7a8714cd5e84e12 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Thu, 30 May 2024 11:15:50 +0300 Subject: [PATCH 3/4] skip verification too --- .github/workflows/docker-base.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-base.yaml b/.github/workflows/docker-base.yaml index 88d34e01cef9a..9c2dda6faf1ea 100644 --- a/.github/workflows/docker-base.yaml +++ b/.github/workflows/docker-base.yaml @@ -66,6 +66,7 @@ jobs: ghcr.io/coder/coder-base:latest - name: Verify that images are pushed properly + if : github.event_name != 'pull_request' run: | # retry 10 times with a 5 second delay as the images may not be # available immediately From fa12fced15ee7f1f0c7a9430730831b86519e3f1 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Thu, 30 May 2024 11:28:58 +0300 Subject: [PATCH 4/4] `make fmt` --- .github/workflows/docker-base.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-base.yaml b/.github/workflows/docker-base.yaml index 9c2dda6faf1ea..a2845a4fdb5f3 100644 --- a/.github/workflows/docker-base.yaml +++ b/.github/workflows/docker-base.yaml @@ -7,7 +7,7 @@ on: paths: - scripts/Dockerfile.base - scripts/Dockerfile - + pull_request: paths: - scripts/Dockerfile.base @@ -66,7 +66,7 @@ jobs: ghcr.io/coder/coder-base:latest - name: Verify that images are pushed properly - if : github.event_name != 'pull_request' + if: github.event_name != 'pull_request' run: | # retry 10 times with a 5 second delay as the images may not be # available immediately