From ac9c77ab3fe56173bb6c6c989cae9fc5e70deb8d Mon Sep 17 00:00:00 2001 From: Gang Li Date: Wed, 18 Mar 2026 10:38:43 +0800 Subject: [PATCH] Update github actions * checkout action: update to v6 * java action: update to v5, and update java version to 17 * maven-settings-xml-action: update to v22 * add dependabot --- .github/dependabot.yml | 19 +++++++++++++++++++ .github/workflows/merge-build.yml | 15 +++++++++------ .github/workflows/pr-build.yml | 11 ++++++----- .github/workflows/unittests.yaml | 9 ++++----- 4 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..f70fe33 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,19 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates +version: 2 +updates: + - package-ecosystem: "maven" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-major"] + + - package-ecosystem: "github-actions" # Also update Github actions + directory: "/" + schedule: + # Check for updates to GitHub Actions every week + interval: "weekly" diff --git a/.github/workflows/merge-build.yml b/.github/workflows/merge-build.yml index 32485a0..07a38bb 100644 --- a/.github/workflows/merge-build.yml +++ b/.github/workflows/merge-build.yml @@ -19,7 +19,10 @@ name: Merge / Push Build -on: [push] +on: + push: + branches: + - 'main' jobs: publish-snapshot: @@ -35,17 +38,17 @@ jobs: MAVEN_OPTS: "-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m" steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: distribution: 'temurin' architecture: x64 - java-version: 11 + java-version: 17 - name: maven-settings-xml-action - uses: whelk-io/maven-settings-xml-action@v14 + uses: whelk-io/maven-settings-xml-action@v22 with: repositories: '[{ "id": "sonatype", "url": "https://oss.sonatype.org/content/repositories/snapshots/", "releases": {"enabled": "false"}, "snapshots": {"enabled": "true" }}]' @@ -58,7 +61,7 @@ jobs: run: mvn -B -e clean install - name: Checkout tools repo - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: Commonjava/commonjava-images path: commonjava-images diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index d943372..ee30027 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -27,16 +27,17 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v5 with: - java-version: '11' - distribution: 'adopt' + distribution: 'temurin' + architecture: x64 + java-version: 17 - name: maven-settings-xml-action - uses: whelk-io/maven-settings-xml-action@v14 + uses: whelk-io/maven-settings-xml-action@v22 with: repositories: '[{ "id": "sonatype", "url": "https://oss.sonatype.org/content/repositories/snapshots/", "releases": {"enabled": "false"}, "snapshots": {"enabled": "true" }}]' diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml index c2b194c..4170d38 100644 --- a/.github/workflows/unittests.yaml +++ b/.github/workflows/unittests.yaml @@ -22,7 +22,6 @@ on: push: branches: - main - - release_* jobs: test: @@ -32,20 +31,20 @@ jobs: strategy: fail-fast: false matrix: - jdk-version: [ "11", "19" ] + jdk-version: [ "17", "21" ] steps: - name: ๐Ÿงบ Checkout Repository Code - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: ๐Ÿ›  Set up JDK ${{ matrix.jdk-version }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: java-version: ${{ matrix.jdk-version }} distribution: 'temurin' cache: maven - name: maven-settings-xml-action - uses: whelk-io/maven-settings-xml-action@v14 + uses: whelk-io/maven-settings-xml-action@v22 with: repositories: '[{ "id": "sonatype", "url": "https://oss.sonatype.org/content/repositories/snapshots/", "releases": {"enabled": "false"}, "snapshots": {"enabled": "true" }}]'