Skip to content

Commit

Permalink
Merge branch 'main' into mvnw
Browse files Browse the repository at this point in the history
  • Loading branch information
xstefank authored Dec 13, 2024
2 parents 9cecd17 + b615d99 commit 893f8c8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ jobs:
run: wget -O $RUNNER_TEMP/java_package.tar.gz ${{ matrix.java.download_url }}
- name: Set up JDK ${{ matrix.java.name }} (manually downloaded)
if: matrix.java.download_url != ''
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
distribution: 'jdkfile'
jdkFile: ${{ runner.temp }}/java_package.tar.gz
java-version: ${{ matrix.java.name }}
architecture: x64
- name: Set up JDK ${{ matrix.java.name }} (automatically downloaded)
if: matrix.java.download_url == ''
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java.name }}
distribution: temurin
Expand All @@ -80,7 +80,7 @@ jobs:

steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/review-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-java@v2
- uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
Expand All @@ -55,7 +55,7 @@ jobs:
VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
echo "::set-output name=SNAPSHOT_VERSION::$VERSION"
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: smallrye-health
path: ~/.m2/repository/io/smallrye
Expand All @@ -69,12 +69,12 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: smallrye-health
path: ~/.m2/repository/io/smallrye

- uses: actions/setup-java@v2
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
Expand Down Expand Up @@ -102,14 +102,14 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: smallrye-health
path: ~/.m2/repository/io/smallrye

- uses: actions/setup-java@v2
- uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: temurin
cache: maven

Expand Down

0 comments on commit 893f8c8

Please sign in to comment.