Skip to content

Commit

Permalink
deps: update actions/setup-java action to v4 (#1995)
Browse files Browse the repository at this point in the history
* deps: update actions/setup-java action to v4

* Update ci-java7.yaml

* Update ci-java7.yaml

* Update ci-java7.yaml

* Update ci-java7.yaml

---------

Co-authored-by: Diego Marquez <diegomarquezp@google.com>
  • Loading branch information
renovate-bot and diegomarquezp authored Aug 21, 2024
1 parent 9d7a716 commit 07aa01c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/ci-java7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v1
- uses: actions/setup-java@v4
# setup-java v2 or higher does not have version 1.7
with:
version: 1.7
java-version: 7
distribution: zulu
architecture: x64
- run: |
java -version
# This value is used in "-Djvm=" later
echo "JAVA7_HOME=${JAVA_HOME}" >> $GITHUB_ENV
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
distribution: zulu
- name: Set up Maven
uses: stCarolas/setup-maven@v4.5
with:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
java: [8, 11, 17]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: ${{matrix.java}}
Expand All @@ -42,7 +42,7 @@ jobs:
- name: Support longpaths
run: git config --system core.longpaths true
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 8
Expand All @@ -57,7 +57,7 @@ jobs:
java: [8, 11, 17]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: ${{matrix.java}}
Expand All @@ -67,7 +67,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
Expand All @@ -79,7 +79,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 8
Expand All @@ -95,7 +95,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 21
distribution: temurin
Expand All @@ -104,7 +104,7 @@ jobs:
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
shell: bash
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 8
distribution: temurin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/downstream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ jobs:
- workflows
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: zulu
java-version: ${{matrix.java}}
Expand Down

0 comments on commit 07aa01c

Please sign in to comment.