From 4f0f03314647953a767016ce7a79ffb4a04ef066 Mon Sep 17 00:00:00 2001 From: Exil Date: Sun, 8 Oct 2023 13:21:39 +0000 Subject: [PATCH 1/2] Revert "Add a GA workflow for building the local Docker image" This reverts commit c4cf5757da5efd77b3c40cd6ab1ef85b3e18cd66. --- .github/workflows/build-local-image.yml | 29 ------------------------- .github/workflows/publish-image.yml | 2 ++ 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 .github/workflows/build-local-image.yml diff --git a/.github/workflows/build-local-image.yml b/.github/workflows/build-local-image.yml deleted file mode 100644 index e9f93f9..0000000 --- a/.github/workflows/build-local-image.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Build local Docker image on Pull Request - -on: - pull_request: - branches: ['master'] - -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - -jobs: - build-image: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.head.ref }} - - - name: Build Docker image - uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 - with: - context: . - push: false - tags: latest diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml index f3f2505..4a1c0ab 100644 --- a/.github/workflows/publish-image.yml +++ b/.github/workflows/publish-image.yml @@ -4,6 +4,8 @@ on: workflow_dispatch: push: branches: ['master'] + pull_request: + branches: ['master'] env: REGISTRY: ghcr.io From a6a9bd2501b3b2a892e84cf568e7e4afc37ed0c0 Mon Sep 17 00:00:00 2001 From: Exil Date: Sun, 8 Oct 2023 13:21:56 +0000 Subject: [PATCH 2/2] Revert "Revert "Add a GA workflow for building the local Docker image"" This reverts commit 4f0f03314647953a767016ce7a79ffb4a04ef066. --- .github/workflows/build-local-image.yml | 29 +++++++++++++++++++++++++ .github/workflows/publish-image.yml | 2 -- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/build-local-image.yml diff --git a/.github/workflows/build-local-image.yml b/.github/workflows/build-local-image.yml new file mode 100644 index 0000000..e9f93f9 --- /dev/null +++ b/.github/workflows/build-local-image.yml @@ -0,0 +1,29 @@ +name: Build local Docker image on Pull Request + +on: + pull_request: + branches: ['master'] + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +jobs: + build-image: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.ref }} + + - name: Build Docker image + uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 + with: + context: . + push: false + tags: latest diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml index 4a1c0ab..f3f2505 100644 --- a/.github/workflows/publish-image.yml +++ b/.github/workflows/publish-image.yml @@ -4,8 +4,6 @@ on: workflow_dispatch: push: branches: ['master'] - pull_request: - branches: ['master'] env: REGISTRY: ghcr.io