Skip to content

ci: fix Docker GHA caching and add merge_group trigger #1101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenjaminMichaelis merged 1 commit into from
May 14, 2026
+2 −12
Merged

ci: fix Docker GHA caching and add merge_group trigger #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .github/workflows/Build-Test-And-Deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/PR-Build-And-Test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: PR Build and Test EssentialCSharp.Web
on:
pull_request:
branches: ["main"]
merge_group:
workflow_dispatch:

jobs:
Expand Down Expand Up @@ -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
Loading