Skip to content

Commit 600a8af

Browse files
authored
Merge pull request #108 from ligangty/main
Update github actions
2 parents d095802 + d5aeb30 commit 600a8af

3 files changed

Lines changed: 37 additions & 13 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: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2021-2023 Red Hat, Inc. (https://github.com/Commonjava/service-parent)
2+
# Copyright (C) 2021-2023 Red Hat, Inc. (https://github.com/Commonjava/indy-generic-proxy-service)
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -19,7 +19,11 @@
1919

2020
name: Merge / Push Build
2121

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

2428
jobs:
2529
publish-snapshot:
@@ -35,17 +39,17 @@ jobs:
3539
MAVEN_OPTS: "-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m"
3640

3741
steps:
38-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@v6
3943

4044
- name: Set up JDK
41-
uses: actions/setup-java@v3
45+
uses: actions/setup-java@v5
4246
with:
4347
distribution: 'temurin'
4448
architecture: x64
45-
java-version: 11
49+
java-version: 17
4650

4751
- name: maven-settings-xml-action
48-
uses: whelk-io/maven-settings-xml-action@v14
52+
uses: whelk-io/maven-settings-xml-action@v22
4953
with:
5054
repositories: '[{ "id": "sonatype", "url": "https://oss.sonatype.org/content/repositories/snapshots/", "releases": {"enabled": "false"}, "snapshots": {"enabled": "true" }}]'
5155

@@ -58,7 +62,7 @@ jobs:
5862
run: mvn -B -e clean install
5963

6064
- name: Checkout tools repo
61-
uses: actions/checkout@v4
65+
uses: actions/checkout@v6
6266
with:
6367
repository: Commonjava/commonjava-images
6468
ref: ubi9

.github/workflows/pr-build.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2021-2023 Red Hat, Inc. (https://github.com/Commonjava/service-parent)
2+
# Copyright (C) 2021-2023 Red Hat, Inc. (https://github.com/Commonjava/indy-generic-proxy-service)
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -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

0 commit comments

Comments
 (0)