Skip to content

Commit 3e60f2e

Browse files
committed
Catchup with github action fixes
1 parent 2036147 commit 3e60f2e

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ updates:
66
interval: daily
77
open-pull-requests-limit: 10
88
ignore:
9-
- dependency-name: "junit:junit"
9+
- dependency-name: junit:junit
1010
versions:
11-
- "3.8.2"
12-
- "4.13.2"
11+
- 3.8.2
12+
- 4.13.2

.github/workflows/build.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: Maven Build
22

33
on:
4+
push:
5+
branches:
6+
- 'wip/**'
47
pull_request:
58
branches: [ "master" ]
69
merge_group:
@@ -14,10 +17,18 @@ jobs:
1417
strategy:
1518
fail-fast: true
1619
matrix:
17-
java: [ 8, 11, 17, 21 ]
20+
java: [ 8, 11 ]
1821
experimental: [false]
22+
include:
23+
- java: 17
24+
experimental: true
1925
steps:
2026
- uses: actions/checkout@v3
27+
- name: Prevent wip merge
28+
if: github.event_name == 'pull_request' && startsWith(github.head_ref, 'wip/')
29+
run: |
30+
echo "::error::WIP branches cannot be merged"
31+
exit 1
2132
- name: Set up JDK ${{ matrix.java }}
2233
uses: actions/setup-java@v3
2334
with:

0 commit comments

Comments
 (0)