Skip to content

Commit 427e087

Browse files
Michael Vasseurvmcj
authored andcommitted
Detect mergequeue branch in another way
Building the image for the readonly branch is not needed as we already know this should work in the PR, only if someone would force merging before the CI passes we would need this.
1 parent d5b5527 commit 427e087

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/build-contributor-container-PR.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
pr-contributor:
1313
if: ${{ !(github.repository == 'domjudge/domjudge-packaging' &&
1414
github.ref == 'refs/heads/main') &&
15-
github.event.action != 'enqueued' &&
15+
!contains(github.ref, 'gh-readonly-queue') &&
1616
(github.event_name == 'pull_request_target' ||
1717
github.event.pull_request.head.repo.full_name != github.repository) }}
1818
runs-on: ubuntu-latest

.github/workflows/build-domjudge-container-PR.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pr-domjudge:
1414
if: ${{ !(github.repository == 'domjudge/domjudge-packaging' &&
1515
github.ref == 'refs/heads/main') &&
16-
github.event.action != 'enqueued' &&
16+
!contains(github.ref, 'gh-readonly-queue') &&
1717
(github.event_name == 'pull_request_target' ||
1818
github.event.pull_request.head.repo.full_name != github.repository) }}
1919
runs-on: ubuntu-latest

.github/workflows/build-gitlab-container-PR.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
pr-gitlab:
1111
if: ${{ !(github.repository == 'domjudge/domjudge-packaging' &&
1212
github.ref == 'refs/heads/main') &&
13-
github.event.action != 'enqueued' &&
13+
!contains(github.ref, 'gh-readonly-queue') &&
1414
(github.event_name == 'pull_request_target' ||
1515
github.event.pull_request.head.repo.full_name != github.repository) }}
1616
name: PR GitLab image

0 commit comments

Comments
 (0)