Skip to content

Commit c1f579b

Browse files
authored
Merge branch 'master' into xcode_offline_role
2 parents 985251d + 9cc52b8 commit c1f579b

File tree

41 files changed

+417
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+417
-140
lines changed

.github/labeler.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,22 @@
99

1010
# label_name:
1111
# - path/to/file_or_folder
12+
1213
ghActions:
13-
- .github/workflows/**/*
14+
- changed-files:
15+
- any-glob-to-any-file: [.github/*]
1416
doc:
15-
- docs/*
16-
- '**/*.md'
17+
- changed-files:
18+
- any-glob-to-any-file: [docs/*, '**/*.md']
1719
Vagrant:
18-
- ansible/pbTestScripts/**/*
19-
- ansible/vagrant/Vagrantfile*
20+
- changed-files:
21+
- any-glob-to-any-file: [ansible/pbTestScripts/**/*, ansible/vagrant/Vagrantfile*]
2022
pbTests:
21-
- ansible/pbTestScripts/**/*
23+
- changed-files:
24+
- any-glob-to-any-file: [ansible/pbTestScripts/**/*]
2225
docker:
23-
- ansible/docker/Dockerfile*
26+
- changed-files:
27+
- any-glob-to-any-file: [ansible/docker/Dockerfile*]
2428
ansible:
25-
- ansible/playbooks/**/*
26-
- ansible/plugins/**/*
27-
- ansible/inventory.yml
28-
- ansible/ansible.cfg
29+
- changed-files:
30+
- any-glob-to-any-file: [ansible/playbooks/**/*, ansible/plugins/**/*, ansible/inventory.yml, ansible/ansible.cfg]

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727

28-
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
28+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2929

3030
- name: Set up Docker Buildx to use cache feature
31-
uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
31+
uses: docker/setup-buildx-action@0d103c3126aa41d772a8362f6aa67afac040f80c # v3.1.0
3232

3333
- name: Login to Docker Hub
3434
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
@@ -39,7 +39,7 @@ jobs:
3939

4040

4141
- name: Docker Build CentOS6 Image Test
42-
uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a # v2.10.0
42+
uses: docker/build-push-action@af5a7ed5ba88268d5278f7203fb52cd833f66d6e # v5.2.0
4343
with:
4444
file: ./ansible/docker/Dockerfile.CentOS6
4545
build-args: git_sha=${{ github.sha }}
@@ -50,7 +50,7 @@ jobs:
5050
if: github.ref != 'refs/heads/master'
5151

5252
- name: Docker Build & Push Centos6 Image to Docker Hub On Merge
53-
uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a # v2.10.0
53+
uses: docker/build-push-action@af5a7ed5ba88268d5278f7203fb52cd833f66d6e # v5.2.0
5454
with:
5555
file: ./ansible/docker/Dockerfile.CentOS6
5656
build-args: git_sha=${{ github.sha }}
@@ -65,13 +65,13 @@ jobs:
6565
runs-on: ubuntu-latest
6666
steps:
6767

68-
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
68+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
6969

7070
- name: Set up Docker Buildx to use cache feature
71-
uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
71+
uses: docker/setup-buildx-action@0d103c3126aa41d772a8362f6aa67afac040f80c # v3.1.0
7272

7373
- name: Docker Build Alpine3 Image
74-
uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a # v2.10.0
74+
uses: docker/build-push-action@af5a7ed5ba88268d5278f7203fb52cd833f66d6e # v5.2.0
7575
with:
7676
file: ./ansible/docker/Dockerfile.Alpine3
7777
build-args: git_sha=${{ github.sha }}

.github/workflows/build_mac.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818
strategy:
1919
matrix:
20-
os: [macos-11]
20+
include:
21+
- os: [macos-11]
22+
- os: [macos-14]
2123
steps:
2224

23-
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
25+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2426

2527
- name: Install dependencies
2628
run: brew install ansible

.github/workflows/build_qemu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
# distro: jessie
3737

3838
steps:
39-
- uses: actions/checkout@01aecccf739ca6ff86c0539fbc67a7a5007bbc81 # v2.1.0
39+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4040

4141
- name: Run on architecture
4242
uses: uraimo/run-on-arch-action@517085f0367c8256bcfa753e3e13e1550af09954 # v2.7.1

.github/workflows/build_vagrant.yml

Lines changed: 40 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,53 @@ permissions:
1919
jobs:
2020
build-solaris:
2121
name: Solaris
22-
runs-on: macos-12
22+
runs-on: ubuntu-latest
2323
steps:
2424

25-
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
25+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2626

27-
- name: Install dependencies
28-
run: |
29-
brew install ansible
27+
- name: Install Ansible
28+
run: sudo apt-get install ansible
29+
30+
- name: Install VirtualBox
31+
run: sudo apt-get install virtualbox
32+
33+
- name: Install Vagrant
34+
run: sudo apt-get install vagrant
35+
36+
- name: Cache Solaris10.box
37+
id: solaris-10-cache
38+
uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
39+
with:
40+
path: Solaris10.box
41+
key: sol10boxcache
3042

31-
- name: Install Solaris 10 Box If Not Already Present
43+
- name: Download Solaris 10 Box If Cache Misses
44+
if: steps.solaris-10-cache.outputs.cache-hit != 'true'
45+
run: wget https://ci.adoptium.net/userContent/vagrant/Solaris10.box.gz
46+
47+
- name: Verify Checksum If Cache Misses
48+
if: steps.solaris-10-cache.outputs.cache-hit != 'true'
3249
run: |
33-
if [ `vagrant box list|grep ^solaris10|wc -l` -gt 0 ]
50+
CKSUM=`shasum -a 256 ./Solaris10.box.gz|cut -d" " -f1`
51+
if [ "$CKSUM" = "0879215f4bf03f5e125addb139d0b5a49a4f8a258297b765cf1f22a8a7ee3309" ]
3452
then
35-
echo "Box Exists - Do Nothing"
53+
echo "Checksum OK"
3654
else
37-
echo "No Box - Download From Jenkins And Import"
38-
wget https://ci.adoptium.net/userContent/vagrant/Solaris10.box.gz
39-
CKSUM=`shasum -a 256 ./Solaris10.box.gz|cut -d" " -f1`
40-
if [ "$CKSUM" = "0879215f4bf03f5e125addb139d0b5a49a4f8a258297b765cf1f22a8a7ee3309" ]
41-
then
42-
echo "Checksum OK"
43-
gunzip Solaris10.box.gz
44-
vagrant box add --name="solaris10" ./Solaris10.box
45-
rm Solaris10.box
46-
else
47-
echo "Sum Bad"
48-
exit 99;
49-
fi
55+
echo "Sum Bad"
56+
exit 99;
5057
fi
5158
59+
- name: Extract Solaris10.box.gz If Cache Misses
60+
if: steps.solaris-10-cache.outputs.cache-hit != 'true'
61+
run: gunzip Solaris10.box.gz
62+
63+
- name: Add Solaris 10 Box To Vagrant
64+
run: vagrant box add --name="solaris10" ./Solaris10.box
65+
5266
- name: Setup Vagrant VM
67+
working-directory: ansible
5368
run: |
54-
cd ansible
5569
ln -sf vagrant/Vagrantfile.Solaris10 Vagrantfile
5670
rm -f id_rsa.pub id_rsa
5771
# Copy the machine's ssh key for the VMs to use, after removing prior files
@@ -61,12 +75,13 @@ jobs:
6175
vagrantPORT=$(vagrant port | grep host | awk '{ print $4 }')
6276
rm -f playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx
6377
echo "[127.0.0.1]:${vagrantPORT}" >> playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx
78+
[ ! -d $HOME/.ssh ] && mkdir $HOME/.ssh && chmod 700 $HOME/.ssh
6479
[ ! -r $HOME/.ssh/known_hosts ] && touch $HOME/.ssh/known_hosts && chmod 644 $HOME/.ssh/known_hosts
80+
[ ! -d $HOME/.ansible ] && mkdir $HOME/.ansible
6581
ssh-keygen -R $(cat playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx)
6682
sed -i -e "s/.*hosts:.*/ hosts: all/g" playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
6783
awk '{print}/^\[defaults\]$/{print "private_key_file = id_rsa"; print "timeout = 60"; print "remote_tmp = $HOME/.ansible/tmp"}' < ansible.cfg > ansible.cfg.tmp && mv ansible.cfg.tmp ansible.cfg
6884
6985
- name: Run Ansible Playbook
70-
run: |
71-
cd ansible
72-
ansible-playbook -i playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx --ssh-common-args='-o StrictHostKeyChecking=no -o HostKeyAlgorithms=ssh-rsa' -u vagrant -b --skip-tags adoptopenjdk,cups playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
86+
working-directory: ansible
87+
run: ansible-playbook -i playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx --ssh-common-args='-o HostKeyAlgorithms=ssh-rsa,ssh-dss,ecdsa-sha2-nistp256,ssh-ed25519 -o PubKeyAcceptedKeyTypes=ssh-rsa' -u vagrant -b --skip-tags adoptopenjdk,cups playbooks/AdoptOpenJDK_Unix_Playbook/main.yml

.github/workflows/build_wsl.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ jobs:
4141
.\ConfigureRemotingForAnsible.ps1 -ForceNewSSLCert
4242
.\ConfigureRemotingForAnsible.ps1 -SkipNetworkProfileCheck
4343
44-
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
44+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4545

46-
- uses: Vampire/setup-wsl@c5a800f46e4525a2e9f0b4d2be3262c85dea9f57 # v2.0.2
46+
- uses: Vampire/setup-wsl@d4e837996638afd047e7b468de70e28fe76cf75a # v3.0.0
4747

4848
- name: Install dependencies
4949
run: |

.github/workflows/check_dockerstatic.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- os: alpine3.19
2929
dockerfile: "Dockerfile.alp319"
3030
steps:
31-
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
31+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3232
- name: Test Dockerfile on ${{ matrix.os }}
3333
env:
3434
DOCKERFILE: ${{ matrix.dockerfile }}
@@ -45,7 +45,7 @@ jobs:
4545
- os: centos8
4646
dockerfile: "Dockerfile.cent8"
4747
steps:
48-
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
48+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4949
- name: Test Dockerfile on ${{ matrix.os }}
5050
env:
5151
DOCKERFILE: ${{ matrix.dockerfile }}
@@ -62,7 +62,7 @@ jobs:
6262
- os: fedora39
6363
dockerfile: "Dockerfile.f39"
6464
steps:
65-
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
65+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
6666
- name: Test Dockerfile on ${{ matrix.os }}
6767
env:
6868
DOCKERFILE: ${{ matrix.dockerfile }}
@@ -83,7 +83,7 @@ jobs:
8383
- os: ubuntu22.04
8484
dockerfile: "Dockerfile.u2204"
8585
steps:
86-
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
86+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
8787
- name: Test Dockerfile on ${{ matrix.os }}
8888
env:
8989
DOCKERFILE: ${{ matrix.dockerfile }}

.github/workflows/code-freeze.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
issue_comment:
88
types: [created]
99

10+
permissions:
11+
contents: write
12+
pull-requests: write
13+
1014
jobs:
1115
codefreeze:
1216
uses: adoptium/.github/.github/workflows/code-freeze.yml@main

.github/workflows/labeler.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,22 @@ on:
55
pull_request_target:
66
issues:
77
issue_comment:
8-
8+
99
jobs:
1010
triage:
11+
permissions:
12+
contents: read
13+
pull-requests: write
14+
issues: write
1115
runs-on: ubuntu-latest
16+
name: Assign Labels
1217
steps:
13-
- uses: actions/labeler@5c7539237e04b714afd8ad9b4aed733815b9fab4 # v4.0.2
18+
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
1419
if: ${{ github.event.pull_request }}
1520
with:
1621
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1722

18-
- uses: fuxingloh/multi-labeler@fb9bc28b2d65e406ffd208384c5095793c3fd59a # v1.8.0
23+
- uses: fuxingloh/multi-labeler@b15a54460c38f54043fa75f7b08a0e2aa5b94b5b # v4.0.0
1924
with:
2025
github-token: "${{secrets.GITHUB_TOKEN}}"
2126
config-path: .github/regex_labeler.yml

.github/workflows/linter.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727

28-
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
28+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2929

3030
- name: 'Yamllint'
3131
uses: karancode/yamllint-github-action@fdef6bc189425ecc84cc4543b2674566c0827053 # v2.1.1
@@ -39,10 +39,10 @@ jobs:
3939
runs-on: ubuntu-latest
4040
steps:
4141

42-
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
42+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4343

4444
- name: Set up Python 3.x
45-
uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # v2.3.3
45+
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
4646
with:
4747
python-version: '3.x'
4848

0 commit comments

Comments
 (0)