Skip to content

Commit

Permalink
Rolls back changes that bumped CI to use Java 21
Browse files Browse the repository at this point in the history
Signed-off-by: Darshit Chanpura <[email protected]>
  • Loading branch information
DarshitChanpura committed Jul 30, 2024
1 parent b4072c6 commit ac217e4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: temurin # Temurin is a distribution of adoptium
java-version: 21
java-version: 17

- name: Checkout security
uses: actions/checkout@v4
Expand All @@ -40,7 +40,7 @@ jobs:
matrix:
gradle_task: ${{ fromJson(needs.generate-test-list.outputs.separateTestsNames) }}
platform: [windows-latest, ubuntu-latest]
jdk: [21]
jdk: [11, 17, 21]
runs-on: ${{ matrix.platform }}

steps:
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
strategy:
fail-fast: false
matrix:
jdk: [21]
jdk: [11, 17, 21]
platform: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.platform }}

Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
strategy:
fail-fast: false
matrix:
jdk: [21]
jdk: [17]
platform: [ubuntu-latest]
runs-on: ${{ matrix.platform }}

Expand All @@ -159,7 +159,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: temurin # Temurin is a distribution of adoptium
java-version: 21
java-version: 17

- name: Checkout Security Repo
uses: actions/checkout@v4
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: temurin # Temurin is a distribution of adoptium
java-version: 21
java-version: 17
- uses: github/codeql-action/init@v3
with:
languages: java
Expand All @@ -219,7 +219,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: temurin # Temurin is a distribution of adoptium
java-version: 21
java-version: 17

- run: |
security_plugin_version=$(./gradlew properties -q | grep -E '^version:' | awk '{print $2}')
Expand Down Expand Up @@ -250,4 +250,4 @@ jobs:

- name: List files in the build directory if there was an error
run: ls -al ./build/distributions/
if: failure()
if: failure()
4 changes: 2 additions & 2 deletions .github/workflows/plugin_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
jdk: [21]
jdk: [11, 17, 21]
runs-on: ${{ matrix.os }}

steps:
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
plugins: "file:$(pwd)/${{ env.PLUGIN_NAME }}.zip"
security-enabled: true
admin-password: ${{ steps.random-password.outputs.generated_name }}
jdk-version: 21
jdk-version: 17

- name: Run sanity tests
uses: gradle/gradle-build-action@v3
Expand Down

0 comments on commit ac217e4

Please sign in to comment.