diff --git a/.github/workflows/Build-Test-And-Deploy.yml b/.github/workflows/Build-Test-And-Deploy.yml index 6870ca55..5afc3a7c 100644 --- a/.github/workflows/Build-Test-And-Deploy.yml +++ b/.github/workflows/Build-Test-And-Deploy.yml @@ -63,17 +63,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v4 - # Build but no push with a PR - - name: Docker build (no push) - if: github.event_name == 'pull_request' || github.event_name == 'merge_group' - uses: docker/build-push-action@v7 - with: - push: false - tags: temp-pr-validation - file: ./EssentialCSharp.Web/Dockerfile - context: . - build-args: ACCESS_TO_NUGET_FEED=false - # Only build for dev registry — prod gets the image via az acr import in deploy-production - name: Build Container Image if: github.event_name != 'pull_request_target' && github.event_name != 'pull_request' diff --git a/.github/workflows/PR-Build-And-Test.yml b/.github/workflows/PR-Build-And-Test.yml index 9793b743..e7b3bc4b 100644 --- a/.github/workflows/PR-Build-And-Test.yml +++ b/.github/workflows/PR-Build-And-Test.yml @@ -3,6 +3,7 @@ name: PR Build and Test EssentialCSharp.Web on: pull_request: branches: ["main"] + merge_group: workflow_dispatch: jobs: @@ -67,7 +68,7 @@ jobs: with: file: ./EssentialCSharp.Web/Dockerfile context: . - outputs: type=docker,dest=${{ github.workspace }}/essentialcsharpwebimage.tar + push: false cache-from: type=gha cache-to: type=gha,mode=max build-args: ACCESS_TO_NUGET_FEED=false