Skip to content

Commit 36f8741

Browse files
committed
Prepare for "master" branch rename
1 parent b8c4ca5 commit 36f8741

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ on:
44
branches:
55
- master
66
- "2.18"
7+
- 2.x
78
paths-ignore:
89
- "README.md"
910
- "release-notes/*"
1011
pull_request:
1112
branches:
1213
- master
1314
- "2.18"
15+
- 2.x
1416
paths-ignore:
1517
- "README.md"
1618
- "release-notes/*"
@@ -19,19 +21,18 @@ permissions:
1921

2022
jobs:
2123
build:
22-
runs-on: ${{ matrix.os }}
24+
runs-on: 'ubuntu-22.04'
2325
strategy:
2426
fail-fast: false
2527
matrix:
2628
# 20-Dec-2022, tatu: Build now requires JDK 11; won't yet work with JDK 17
2729
java_version: [ '11']
28-
os: ['ubuntu-22.04']
2930
env:
3031
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
3132
steps:
32-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v4.2.2
3334
- name: Set up JDK
34-
uses: actions/setup-java@v3
35+
uses: actions/setup-java@v4.6.0
3536
with:
3637
distribution: 'temurin'
3738
java-version: ${{ matrix.java_version }}
@@ -46,9 +47,9 @@ jobs:
4647
run: ./mvnw -B -q -ff -ntp verify
4748
- name: Extract project Maven version
4849
id: projectVersion
49-
run: echo "version=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.3.0:evaluate -DforceStdout -Dexpression=project.version -q)" >>$GITHUB_OUTPUT
50+
run: echo "version=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate -DforceStdout -Dexpression=project.version -q)" >>$GITHUB_OUTPUT
5051
- name: Deploy snapshot
51-
if: github.event_name != 'pull_request' && matrix.java_version == '11' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT')
52+
if: ${{ github.event_name != 'pull_request' && matrix.java_version == '11' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT') }}
5253
env:
5354
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
5455
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}

0 commit comments

Comments
 (0)