Skip to content

Commit 320df59

Browse files
authored
Merge pull request #90 from ligangty/main
Update github actions
2 parents fb0ee05 + 991d302 commit 320df59

5 files changed

Lines changed: 38 additions & 198 deletions

File tree

.github/dependabot.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
ignore:
12+
- dependency-name: "*"
13+
update-types: ["version-update:semver-major"]
14+
15+
- package-ecosystem: "github-actions" # Also update Github actions
16+
directory: "/"
17+
schedule:
18+
# Check for updates to GitHub Actions every week
19+
interval: "weekly"

.github/workflows/merge-build.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,14 @@
1919

2020
name: Merge / Push Build
2121

22-
on: [push]
22+
on:
23+
push:
24+
branches:
25+
- 'main'
26+
- '1.0.x'
27+
paths:
28+
- 'src/**'
29+
- 'pom.xml'
2330

2431
jobs:
2532
publish-snapshot:
@@ -35,17 +42,17 @@ jobs:
3542
MAVEN_OPTS: "-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m"
3643

3744
steps:
38-
- uses: actions/checkout@v4
45+
- uses: actions/checkout@v6
3946

4047
- name: Set up JDK
41-
uses: actions/setup-java@v3
48+
uses: actions/setup-java@v5
4249
with:
4350
distribution: 'temurin'
4451
architecture: x64
45-
java-version: 11
52+
java-version: 17
4653

4754
- name: maven-settings-xml-action
48-
uses: whelk-io/maven-settings-xml-action@v14
55+
uses: whelk-io/maven-settings-xml-action@v22
4956
with:
5057
repositories: '[{ "id": "sonatype", "url": "https://oss.sonatype.org/content/repositories/snapshots/", "releases": {"enabled": "false"}, "snapshots": {"enabled": "true" }}]'
5158

@@ -58,7 +65,7 @@ jobs:
5865
run: mvn -B -e clean install
5966

6067
- name: Checkout tools repo
61-
uses: actions/checkout@v4
68+
uses: actions/checkout@v6
6269
with:
6370
repository: Commonjava/commonjava-images
6471
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

Jenkinsfile

Lines changed: 0 additions & 102 deletions
This file was deleted.

Jenkinsfile.sidecar

Lines changed: 0 additions & 85 deletions
This file was deleted.

0 commit comments

Comments
 (0)