Skip to content

Commit

Permalink
[Backport 2.x] dependabot: bump actions/setup-java from 1 to 3 (opens…
Browse files Browse the repository at this point in the history
…earch-project#3142) (opensearch-project#3197)

### Description
Backport 7e33bf3 from opensearch-project#3142.

### Check List
- [ ] ~New functionality includes testing~
- [ ] ~New functionality has been documented~
- [X] Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and
signing off your commits, please check
[here](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Peter Nied <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
peternied and dependabot[bot] authored Aug 17, 2023
1 parent 25cf45a commit 4ee078b
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 126 deletions.
42 changes: 0 additions & 42 deletions .github/workflows/bwc-tests.yml

This file was deleted.

73 changes: 0 additions & 73 deletions .github/workflows/cd.yml

This file was deleted.

15 changes: 9 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
separateTestsNames: ${{ steps.set-matrix.outputs.separateTestsNames }}
steps:
- name: Set up JDK for build and test
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: temurin # Temurin is a distribution of adoptium
java-version: 17
Expand All @@ -38,7 +38,7 @@ jobs:

steps:
- name: Set up JDK for build and test
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: temurin # Temurin is a distribution of adoptium
java-version: ${{ matrix.jdk }}
Expand Down Expand Up @@ -80,8 +80,9 @@ jobs:
runs-on: ${{ matrix.platform }}

steps:
- uses: actions/setup-java@v1
- uses: actions/setup-java@v3
with:
distribution: temurin # Temurin is a distribution of adoptium
java-version: ${{ matrix.jdk }}

- name: Checkout Security Repo
Expand All @@ -97,9 +98,10 @@ jobs:
code-ql:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: temurin # Temurin is a distribution of adoptium
java-version: 11
- uses: github/codeql-action/init@v1
with:
Expand All @@ -112,8 +114,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-java@v1
- uses: actions/setup-java@v3
with:
distribution: temurin # Temurin is a distribution of adoptium
java-version: 11

- run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/code-hygiene.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-java@v2
- uses: actions/setup-java@v3
with:
distribution: temurin # Temurin is a distribution of adoptium
java-version: 11
Expand All @@ -35,7 +35,7 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-java@v2
- uses: actions/setup-java@v3
with:
distribution: temurin # Temurin is a distribution of adoptium
java-version: 11
Expand All @@ -51,7 +51,7 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-java@v2
- uses: actions/setup-java@v3
with:
distribution: temurin # Temurin is a distribution of adoptium
java-version: 11
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
test-run: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]

steps:
- uses: actions/setup-java@v2
- uses: actions/setup-java@v3
with:
distribution: temurin # Temurin is a distribution of adoptium
java-version: ${{ matrix.jdk }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/plugin_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ jobs:

steps:
- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distribution: temurin # Temurin is a distribution of adoptium
java-version: ${{ matrix.jdk }}

- name: Checkout Branch
Expand Down

0 comments on commit 4ee078b

Please sign in to comment.