Skip to content

Commit

Permalink
Add support for OpenJDK versions 19, 20, 21 and 22 (#715)
Browse files Browse the repository at this point in the history
* Add support for OpenJDK versions 19, 20, 21 and 22
* Remove the commented-out adoptopenjdk_linux_install resource.
* chore(deps): update sous-chefs/.github action to v3.1.0
* chore(deps): update actionshub/chef-install action to v3
* Doc fixes
* Cleanup changelog
* Update platforms
* Remove AdoptOpenJDK
* Remove MacOS suite
---------

Signed-off-by: Lance Albertson <[email protected]>
Signed-off-by: Dan Webb <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Dan Webb <[email protected]>
  • Loading branch information
3 people authored Dec 3, 2024
1 parent 2989ee6 commit 5bfb37c
Show file tree
Hide file tree
Showing 32 changed files with 97 additions and 1,189 deletions.
70 changes: 11 additions & 59 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,36 +22,25 @@ jobs:
strategy:
matrix:
os:
- almalinux-8
- amazonlinux-2
- debian-10
- amazonlinux-2023
- debian-12
- debian-11
- centos-7
- centos-stream-8
- ubuntu-1804
- ubuntu-2004
- ubuntu-2204
- rockylinux-9
- rockylinux-8
- ubuntu-2204
- ubuntu-2004
suite:
- openjdk-11
# - openjdk-11 # Debian doesn't have an 11 package
- openjdk-16
- openjdk-17
- adoptopenjdk-8-openj9
- adoptopenjdk-11-hotspot
- adoptopenjdk-11-openj9
- adoptopenjdk-11-openj9-large-heap
- adoptopenjdk-14-hotspot
- adoptopenjdk-14-openj9
- adoptopenjdk-14-openj9-large-heap
- adoptopenjdk-removal-11-openj9
# - temurin-8-hotspot
# - temurin-11-hotspot
# - semeru-11-openj9
# - semeru-17-openj9
- corretto-8
- corretto-11
- corretto-17
- corretto-18
- custom-package-8
- custom-package-11
- custom-package-11-openj9
- custom-package-11-openj9-large-heap
fail-fast: false
steps:
- name: Check out code
Expand All @@ -67,45 +56,8 @@ jobs:
suite: ${{ matrix.suite }}
os: ${{ matrix.os }}

integration-macos:
needs: "lint-unit"
runs-on: macos-latest
steps:
- name: Check out code
uses: actions/checkout@v4
- name: Install Chef
uses: actionshub/[email protected]
- name: Kitchen Converge
uses: actionshub/[email protected]
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.macos.yml
TERM: xterm-256color
with:
suite: adoptopenjdk-14
os: macos
action: converge
- name: Source Profile for JAVA_HOME
run: |
source /etc/profile
echo "sourced profile for JAVA_HOME"
echo "New JAVA home after Chef run is: ${JAVA_HOME}"
# Magic line for github actions to persist the change
echo "JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
- name: Kitchen Verify
uses: actionshub/[email protected]
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.macos.yml
TERM: xterm-256color
with:
suite: adoptopenjdk-14
os: macos
action: verify

final:
runs-on: ubuntu-latest
needs: [integration, integration-macos]
needs: [integration]
steps:
- run: echo ${{needs.integration.outputs}}
- run: echo ${{needs.integration-macos.outputs}}
2 changes: 2 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
require:
- cookstyle
Loading

0 comments on commit 5bfb37c

Please sign in to comment.