Skip to content

Commit a40db71

Browse files
committed
Update github actions
* actions/checkout to v6 * actions/setup-java to v5 * whelk-io/maven-settings-xml-action to v22 * add dependabot
1 parent 12ee9c6 commit a40db71

4 files changed

Lines changed: 36 additions & 12 deletions

File tree

.github/dependabot.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
version: 2
6+
updates:
7+
- package-ecosystem: "maven" # See documentation for possible values
8+
directory: "/" # Location of package manifests
9+
schedule:
10+
interval: "weekly"
11+
12+
- package-ecosystem: "github-actions" # Also update Github actions
13+
directory: "/"
14+
schedule:
15+
# Check for updates to GitHub Actions every week
16+
interval: "weekly"

.github/workflows/merge-build.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,36 @@
1919

2020
name: Merge / Push Build
2121

22-
on: [push]
22+
on:
23+
push:
24+
branches:
25+
- 'master'
2326

2427
jobs:
2528
publish-snapshot:
2629
name: publish to oss sonatype & push image
2730

2831
runs-on: ubuntu-latest
2932

30-
permissions:
33+
permissions:
3134
contents: read
3235
packages: write
3336

3437
env:
3538
MAVEN_OPTS: "-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m"
3639

3740
steps:
38-
- uses: actions/checkout@v4
41+
- uses: actions/checkout@v6
3942

4043
- name: Set up JDK
41-
uses: actions/setup-java@v3
44+
uses: actions/setup-java@v5
4245
with:
4346
distribution: 'temurin'
4447
architecture: x64
45-
java-version: 11
48+
java-version: 17
4649

4750
- name: maven-settings-xml-action
48-
uses: whelk-io/maven-settings-xml-action@v14
51+
uses: whelk-io/maven-settings-xml-action@v22
4952
with:
5053
repositories: '[{ "id": "sonatype", "url": "https://oss.sonatype.org/content/repositories/snapshots/", "releases": {"enabled": "false"}, "snapshots": {"enabled": "true" }}]'
5154

@@ -58,7 +61,7 @@ jobs:
5861
run: mvn -B -e clean install
5962

6063
- name: Checkout tools repo
61-
uses: actions/checkout@v4
64+
uses: actions/checkout@v6
6265
with:
6366
repository: Commonjava/commonjava-images
6467
path: commonjava-images

.github/workflows/pr-build.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,17 @@ 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:
35-
java-version: '11'
36-
distribution: 'adopt'
35+
distribution: 'temurin'
36+
architecture: x64
37+
java-version: 17
3738

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

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,7 @@ hs_err_pid*
4444

4545
# cache is generated folder
4646
cache/
47+
48+
# config is used for local testing
49+
config/
50+

0 commit comments

Comments
 (0)