Skip to content

Commit

Permalink
Merge branch 'main' into openjdk-newer-versions
Browse files Browse the repository at this point in the history
  • Loading branch information
damacus authored Dec 3, 2024
2 parents cf061c7 + 2989ee6 commit ecc74bc
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 43 deletions.
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
use chefworkstation
export KITCHEN_GLOBAL_YAML=kitchen.global.yml
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name: "Test"

jobs:
lint-unit:
uses: sous-chefs/.github/.github/workflows/lint-unit.yml@3.1.0
uses: sous-chefs/.github/.github/workflows/lint-unit.yml@3.1.1
permissions:
actions: write
checks: write
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Install Chef
uses: actionshub/chef-install@3.0.0
- name: Dokken
uses: actionshub/test-kitchen@2.1.0
uses: actionshub/test-kitchen@3.0.0
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.dokken.yml
Expand All @@ -76,7 +76,7 @@ jobs:
- name: Install Chef
uses: actionshub/chef-install@3.0.0
- name: Kitchen Converge
uses: actionshub/test-kitchen@2.1.0
uses: actionshub/test-kitchen@3.0.0
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.macos.yml
Expand All @@ -93,7 +93,7 @@ jobs:
# Magic line for github actions to persist the change
echo "JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
- name: Kitchen Verify
uses: actionshub/test-kitchen@2.1.0
uses: actionshub/test-kitchen@3.0.0
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.macos.yml
Expand Down
2 changes: 2 additions & 0 deletions .markdownlint-cli2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ config:
line-length: false # MD013
no-duplicate-heading: false # MD024
reference-links-images: false # MD052
ignores:
- .github/copilot-instructions.md
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,25 @@ This file is used to list changes made in each version of the Java cookbook.
- CI: chore(deps): update sous-chefs/.github action to v3.1.0
- CI: chore(deps): update actionshub/chef-install action to v3

## 12.0.7 - *2024-11-18*

Standardise files with files in sous-chefs/repo-management

Standardise files with files in sous-chefs/repo-management

## 12.0.6 - *2024-07-15*

Standardise files with files in sous-chefs/repo-management

Standardise files with files in sous-chefs/repo-management

Standardise files with files in sous-chefs/repo-management

## 12.0.5 - *2024-05-03*

## 12.0.4 - *2024-05-03*


Check failure on line 30 in CHANGELOG.md

View workflow job for this annotation

GitHub Actions / lint-unit / markdownlint-cli2

Multiple consecutive blank lines

CHANGELOG.md:30 MD012/no-multiple-blanks Multiple consecutive blank lines [Expected: 1; Actual: 2] https://github.com/DavidAnson/markdownlint/blob/v0.34.0/doc/md012.md
## 12.0.3 - *2024-01-16*

## 12.0.2 - *2024-01-16*
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing

Please refer to
[https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD)
[https://github.com/chef-cookbooks/community_cookbook_documentation/blob/main/CONTRIBUTING.MD](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/main/CONTRIBUTING.MD)
2 changes: 1 addition & 1 deletion TESTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Testing

Please refer to [the community cookbook documentation on testing](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/TESTING.MD).
Please refer to [the community cookbook documentation on testing](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/main/TESTING.MD).
38 changes: 9 additions & 29 deletions kitchen.dokken.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,25 @@ platforms:
image: dokken/almalinux-9
pid_one_command: /usr/lib/systemd/systemd

- name: amazonlinux-2023
driver:
image: dokken/amazonlinux-2023
pid_one_command: /usr/lib/systemd/systemd

- name: centos-7
- name: almalinux-10
driver:
image: dokken/centos-7
image: dokken/almalinux-10
pid_one_command: /usr/lib/systemd/systemd

- name: centos-stream-8
- name: amazonlinux-2023
driver:
image: dokken/centos-stream-8
image: dokken/amazonlinux-2023
pid_one_command: /usr/lib/systemd/systemd

- name: centos-stream-9
driver:
image: dokken/centos-stream-9
pid_one_command: /usr/lib/systemd/systemd

- name: debian-9
driver:
image: dokken/debian-9
pid_one_command: /bin/systemd

- name: debian-10
- name: centos-stream-10
driver:
image: dokken/debian-10
pid_one_command: /bin/systemd
image: dokken/centos-stream-10
pid_one_command: /usr/lib/systemd/systemd

- name: debian-11
driver:
Expand All @@ -67,11 +57,6 @@ platforms:
image: dokken/opensuse-leap-15
pid_one_command: /usr/lib/systemd/systemd

- name: oraclelinux-7
driver:
image: dokken/oraclelinux-7
pid_one_command: /usr/lib/systemd/systemd

- name: oraclelinux-8
driver:
image: dokken/oraclelinux-8
Expand All @@ -92,11 +77,6 @@ platforms:
image: dokken/rockylinux-9
pid_one_command: /usr/lib/systemd/systemd

- name: ubuntu-18.04
driver:
image: dokken/ubuntu-18.04
pid_one_command: /bin/systemd

- name: ubuntu-20.04
driver:
image: dokken/ubuntu-20.04
Expand All @@ -107,7 +87,7 @@ platforms:
image: dokken/ubuntu-22.04
pid_one_command: /bin/systemd

- name: ubuntu-23.04
- name: ubuntu-24.04
driver:
image: dokken/ubuntu-23.04
image: dokken/ubuntu-24.04
pid_one_command: /bin/systemd
8 changes: 1 addition & 7 deletions kitchen.global.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,15 @@ platforms:
- name: almalinux-8
- name: almalinux-9
- name: amazonlinux-2023
- name: centos-7
- name: centos-stream-8
- name: centos-stream-9
- name: debian-9
- name: debian-10
- name: debian-11
- name: debian-12
- name: fedora-latest
- name: opensuse-leap-15
- name: oraclelinux-7
- name: oraclelinux-8
- name: oraclelinux-9
- name: rockylinux-8
- name: rockylinux-9
- name: ubuntu-18.04
- name: ubuntu-20.04
- name: ubuntu-22.04
- name: ubuntu-23.04
- name: ubuntu-24.04
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
source_url 'https://github.com/sous-chefs/java'
issues_url 'https://github.com/sous-chefs/java/issues'
chef_version '>= 16.0'
version '12.0.3'
version '12.0.7'

supports 'debian'
supports 'ubuntu'
Expand Down

0 comments on commit ecc74bc

Please sign in to comment.