Skip to content

Commit 8f66ac7

Browse files
authored
Merge pull request #32 from ligangty/main
Update github actions
2 parents 7716e57 + e7acbaf commit 8f66ac7

4 files changed

Lines changed: 38 additions & 39 deletions

File tree

.github/dependabot.yml

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

.github/workflows/merge-build.yml

Lines changed: 11 additions & 9 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+
- 'quarkus-2'
2327

2428
jobs:
2529
publish-snapshot:
@@ -31,19 +35,17 @@ 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:
39-
java-version: '11'
40-
distribution: 'adopt'
41-
# server-id: sonatype
42-
# server-username: SONATYPE_BOT_USERNAME
43-
# server-password: SONATYPE_BOT_TOKEN
43+
distribution: 'temurin'
44+
architecture: x64
45+
java-version: 17
4446

4547
- name: maven-settings-xml-action
46-
uses: whelk-io/maven-settings-xml-action@v14
48+
uses: whelk-io/maven-settings-xml-action@v22
4749
if: ${{ github.event.repository.fork == false }}
4850
with:
4951
repositories: '[{ "id": "sonatype", "url": "https://oss.sonatype.org/content/repositories/snapshots/", "releases": {"enabled": "false"}, "snapshots": {"enabled": "true" }}]'

.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 & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)