From 1fe07b63fcdefa04d365247961faffa49130ec47 Mon Sep 17 00:00:00 2001 From: initstring <26131150+initstring@users.noreply.github.com> Date: Sat, 20 Sep 2025 15:07:39 +1000 Subject: [PATCH] feat: Clarify GH Actions --- .github/workflows/ci.yml | 1 - .github/workflows/docker-pr.yml | 22 +++++++++++++++ .../{docker.yml => docker-release.yml} | 27 +++---------------- 3 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 .github/workflows/docker-pr.yml rename .github/workflows/{docker.yml => docker-release.yml} (66%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 632636b..e92c95b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,6 @@ on: push: branches: [ main ] pull_request: - branches: [ main ] jobs: build-and-test: diff --git a/.github/workflows/docker-pr.yml b/.github/workflows/docker-pr.yml new file mode 100644 index 0000000..a0e3b8b --- /dev/null +++ b/.github/workflows/docker-pr.yml @@ -0,0 +1,22 @@ +name: Validate Docker Build + +on: + pull_request: + +jobs: + validate-docker-build: + name: Build Docker Image (no push) + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Build image + uses: docker/build-push-action@v6 + with: + context: . + file: deploy/docker/Dockerfile + push: false diff --git a/.github/workflows/docker.yml b/.github/workflows/docker-release.yml similarity index 66% rename from .github/workflows/docker.yml rename to .github/workflows/docker-release.yml index 9005813..c3f903c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker-release.yml @@ -1,8 +1,6 @@ -name: Build and Push Docker Image +name: Publish Docker Image on: - pull_request: - branches: [ main ] release: # Publishing a release for an existing tag (via the GitHub UI) does not # emit a push event, so include this trigger to build the image when a @@ -10,25 +8,8 @@ on: types: [ published ] jobs: - docker-build-pr: - if: github.event_name == 'pull_request' - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Build image (no push) - uses: docker/build-push-action@v6 - with: - context: . - file: deploy/docker/Dockerfile - push: false - - docker: - if: github.event_name == 'release' + publish: + name: Publish Docker Image to GHCR runs-on: ubuntu-latest permissions: contents: read @@ -55,7 +36,7 @@ jobs: tags: | type=ref,event=tag - - name: Build and push + - name: Build and push image uses: docker/build-push-action@v6 with: context: .