Skip to content

Commit a73e75e

Browse files
authored
Merge pull request #54 from ligangty/main
Update github actions
2 parents 819f845 + 0522d60 commit a73e75e

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

.github/workflows/merge-build.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919

2020
name: Merge / Push Build
2121

22-
on: [push]
22+
on:
23+
push:
24+
branches:
25+
- 'main'
26+
- '3.3.x'
2327

2428
jobs:
2529
publish-snapshot:
@@ -31,10 +35,10 @@ jobs:
3135
packages: write
3236

3337
steps:
34-
- uses: actions/checkout@v2
38+
- uses: actions/checkout@v6
3539

3640
- name: Set up JDK
37-
uses: actions/setup-java@v2
41+
uses: actions/setup-java@v5
3842
with:
3943
java-version: '11'
4044
distribution: 'adopt'
@@ -43,7 +47,7 @@ jobs:
4347
# server-password: SONATYPE_BOT_TOKEN
4448

4549
- name: maven-settings-xml-action
46-
uses: whelk-io/maven-settings-xml-action@v14
50+
uses: whelk-io/maven-settings-xml-action@v22
4751
if: ${{ github.event.repository.fork == false }}
4852
with:
4953
servers: '[{ "id": "central-portal-snapshots", "username": "${{ secrets.SONATYPE_BOT_USERNAME}}", "password": "${{ secrets.SONATYPE_BOT_TOKEN}}" }]'

.github/workflows/pr-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ jobs:
2727
runs-on: ubuntu-latest
2828

2929
steps:
30-
- uses: actions/checkout@v2
30+
- uses: actions/checkout@v6
3131

3232
- name: Set up JDK
33-
uses: actions/setup-java@v2
33+
uses: actions/setup-java@v5
3434
with:
3535
java-version: '11'
3636
distribution: 'adopt'
3737

3838
- name: maven-settings-xml-action
39-
uses: whelk-io/maven-settings-xml-action@v14
39+
uses: whelk-io/maven-settings-xml-action@v22
4040
with:
4141
repositories: '[{ "id": "sonatype", "url": "https://oss.sonatype.org/content/repositories/snapshots/", "releases": {"enabled": "false"}, "snapshots": {"enabled": "true" }}]'
4242

0 commit comments

Comments
 (0)