Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade java 21 #611

Merged
merged 130 commits into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from 128 commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
6bd7b74
copy changes from Thomas's branch
Ian-Nara Jun 11, 2024
c5ba1c3
specify release and update docker base
Ian-Nara Jun 12, 2024
9642372
build and test using java 21
Ian-Nara Jun 12, 2024
a1d9baf
upgrade jacoco
Ian-Nara Jun 12, 2024
400a985
java versions docker builds
Ian-Nara Jun 12, 2024
e816ccf
[CI Pipeline] Released Snapshot version: 5.37.16-alpha-85-SNAPSHOT
Jun 12, 2024
0d97f38
validate-image java version
Ian-Nara Jun 12, 2024
8bee91e
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jun 12, 2024
25f451c
[CI Pipeline] Released Snapshot version: 5.37.17-alpha-139-SNAPSHOT
Jun 12, 2024
989cb0e
scripts/gcp-oidc dockerfile base image
Ian-Nara Jun 12, 2024
d7ef3b6
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jun 12, 2024
cc4232e
scripts\azure-cc\Dockerfile base image
Ian-Nara Jun 12, 2024
520358a
[CI Pipeline] Released Snapshot version: 5.37.18-alpha-140-SNAPSHOT
Jun 12, 2024
02d59c4
[CI Pipeline] Released Snapshot version: 5.37.19-alpha-108-SNAPSHOT
Jun 12, 2024
026d11a
updating aws java versions
Ian-Nara Jun 12, 2024
bb2ac8e
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jun 12, 2024
fdb31dd
[CI Pipeline] Released Snapshot version: 5.37.20-alpha-146-SNAPSHOT
Jun 12, 2024
3f8df2a
debian -> ubuntu for openjdk-21-jdk package
Ian-Nara Jun 13, 2024
9727b4d
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jun 13, 2024
58f9bae
[CI Pipeline] Released Snapshot version: 5.37.21-alpha-147-SNAPSHOT
Jun 13, 2024
5a4ee5e
[CI Pipeline] Released Snapshot version: 5.37.22-alpha-148-SNAPSHOT
Jun 13, 2024
6c0d87f
testing build on debian again
Ian-Nara Jun 13, 2024
5c78375
[CI Pipeline] Released Snapshot version: 5.37.23-alpha-149-SNAPSHOT
Jun 13, 2024
a51bccb
try alpine w/ eclipse temurin
Ian-Nara Jun 14, 2024
1ec7915
[CI Pipeline] Released Snapshot version: 5.37.24-alpha-151-SNAPSHOT
Jun 14, 2024
8b52a92
ubuntu
Ian-Nara Jun 14, 2024
875ae9b
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jun 14, 2024
0ed4c74
[CI Pipeline] Released Snapshot version: 5.37.25-alpha-152-SNAPSHOT
Jun 14, 2024
3519134
ubuntu
Ian-Nara Jun 14, 2024
4371e4a
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jun 14, 2024
f00d338
[CI Pipeline] Released Snapshot version: 5.37.26-alpha-153-SNAPSHOT
Jun 14, 2024
cb22b33
testing build
Ian-Nara Jun 14, 2024
59b1036
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jun 14, 2024
f0ff20c
[CI Pipeline] Released Snapshot version: 5.37.27-alpha-154-SNAPSHOT
Jun 14, 2024
8713d25
testing build
Ian-Nara Jun 14, 2024
c5931dc
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jun 14, 2024
3eb8b3f
testing build
Ian-Nara Jun 14, 2024
21f6682
[CI Pipeline] Released Snapshot version: 5.37.28-alpha-155-SNAPSHOT
Jun 14, 2024
6948aec
install libssl1.1 from focal package
Ian-Nara Jun 14, 2024
9db3bec
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jun 14, 2024
d4f8d64
[CI Pipeline] Released Snapshot version: 5.37.29-alpha-156-SNAPSHOT
Jun 14, 2024
7cfd327
[CI Pipeline] Released Snapshot version: 5.37.30-alpha-157-SNAPSHOT
Jun 14, 2024
80deb91
show disk usage
Ian-Nara Jun 14, 2024
0daee92
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jun 14, 2024
5f29f4e
[CI Pipeline] Released Snapshot version: 5.37.31-alpha-158-SNAPSHOT
Jun 14, 2024
36f9218
show disk usage
Ian-Nara Jun 14, 2024
cd1da01
[CI Pipeline] Released Snapshot version: 5.37.32-alpha-159-SNAPSHOT
Jun 14, 2024
4833831
show disk usage before build for comparison
Ian-Nara Jun 15, 2024
a8f9997
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jun 15, 2024
ffe3d4f
[CI Pipeline] Released Snapshot version: 5.37.33-alpha-160-SNAPSHOT
Jun 15, 2024
883c165
try removing all docker container and image after build
Ian-Nara Jun 15, 2024
c0d4b28
[CI Pipeline] Released Snapshot version: 5.37.34-alpha-161-SNAPSHOT
Jun 15, 2024
6dad847
[CI Pipeline] Released Snapshot version: 5.37.35-alpha-162-SNAPSHOT
Jun 15, 2024
126ef6b
update workflow to reference action on my branch
Ian-Nara Jun 15, 2024
6bdac02
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jun 15, 2024
5f2cb4a
[CI Pipeline] Released Snapshot version: 5.37.36-alpha-163-SNAPSHOT
Jun 15, 2024
ec771fc
Merge branch 'refs/heads/main' into ian-UID2-3362-upgrade-java-21
Ian-Nara Jun 17, 2024
7dd14a2
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jun 17, 2024
ae1b0bc
update workflow to reference action on my branch
Ian-Nara Jun 17, 2024
6853f01
[CI Pipeline] Released Snapshot version: 5.37.37-alpha-165-SNAPSHOT
Jun 17, 2024
a526de4
_ -> -
Ian-Nara Jun 17, 2024
ffa77ee
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jun 17, 2024
fa3644c
use action on branch
Ian-Nara Jun 17, 2024
82d3f26
update inputs for download
Ian-Nara Jun 17, 2024
bcaeecd
already unzipped?
Ian-Nara Jun 17, 2024
3643019
try without .zip extension
Ian-Nara Jun 17, 2024
f0c9570
set merge multiple true
Ian-Nara Jun 17, 2024
024eebb
remove unzip action
Ian-Nara Jun 17, 2024
a3dcf08
reference action on branch for EUID also
Ian-Nara Jun 17, 2024
ebe7c59
use 22.04 during build
Ian-Nara Jun 18, 2024
63ad0ff
remove comment
Ian-Nara Jun 18, 2024
de271d4
[CI Pipeline] Released Snapshot version: 5.37.38-alpha-166-SNAPSHOT
Jun 18, 2024
8506e56
[CI Pipeline] Released Snapshot version: 5.37.39-alpha-207-SNAPSHOT
Jul 8, 2024
cd8847e
[CI Pipeline] Released Snapshot version: 5.37.40-alpha-208-SNAPSHOT
Jul 8, 2024
0c1ace3
Merge remote-tracking branch 'origin/main' into ian-UID2-3362-upgrade…
Ian-Nara Jul 8, 2024
7236241
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jul 8, 2024
0e8e595
[CI Pipeline] Released Snapshot version: 5.37.16-alpha-209-SNAPSHOT
Jul 8, 2024
0b53060
removing invalidated changes
Ian-Nara Jul 8, 2024
0ce8970
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jul 8, 2024
15b26b4
removing invalidated changes
Ian-Nara Jul 8, 2024
030310f
[CI Pipeline] Released Snapshot version: 5.37.17-alpha-210-SNAPSHOT
Jul 8, 2024
38e1c6e
serialize jobs and strengthen clean up to handle out of disk space
Ian-Nara Jul 8, 2024
4e2792a
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jul 8, 2024
5a7c095
[CI Pipeline] Released Snapshot version: 5.37.18-alpha-211-SNAPSHOT
Jul 8, 2024
1bb594d
remove disk space check
Ian-Nara Jul 8, 2024
d5e160d
[CI Pipeline] Released Snapshot version: 5.37.19-alpha-212-SNAPSHOT
Jul 8, 2024
37b7a97
remove disk space check
Ian-Nara Jul 8, 2024
1907191
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jul 8, 2024
cb5a1ea
[CI Pipeline] Released Snapshot version: 5.37.20-alpha-213-SNAPSHOT
Jul 8, 2024
9fd367e
[CI Pipeline] Released Snapshot version: 5.37.21-alpha-214-SNAPSHOT
Jul 8, 2024
e7fb0cf
try cleanup immediately after eif build
Ian-Nara Jul 8, 2024
856f782
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jul 8, 2024
9268041
[CI Pipeline] Released Snapshot version: 5.37.22-alpha-215-SNAPSHOT
Jul 8, 2024
5d36295
try to keep amazonlinux container running
Ian-Nara Jul 8, 2024
9fa5e31
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jul 8, 2024
715dadc
[CI Pipeline] Released Snapshot version: 5.37.23-alpha-216-SNAPSHOT
Jul 8, 2024
eb43150
try docker prune
Ian-Nara Jul 8, 2024
ef0dccf
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jul 8, 2024
4e61d0f
[CI Pipeline] Released Snapshot version: 5.37.24-alpha-217-SNAPSHOT
Jul 8, 2024
f4686b2
try docker prune
Ian-Nara Jul 8, 2024
49a8611
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jul 8, 2024
5e9b92e
[CI Pipeline] Released Snapshot version: 5.37.25-alpha-218-SNAPSHOT
Jul 8, 2024
888bfab
try docker prune
Ian-Nara Jul 8, 2024
44a9114
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jul 8, 2024
155241a
[CI Pipeline] Released Snapshot version: 5.37.26-alpha-219-SNAPSHOT
Jul 8, 2024
7ac40c6
try docker prune
Ian-Nara Jul 8, 2024
e1760fe
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jul 8, 2024
7c75b45
[CI Pipeline] Released Snapshot version: 5.37.27-alpha-220-SNAPSHOT
Jul 8, 2024
d4321e0
[CI Pipeline] Released Snapshot version: 5.37.28-alpha-221-SNAPSHOT
Jul 8, 2024
d161e57
try docker prune
Ian-Nara Jul 9, 2024
6f3f28c
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jul 9, 2024
feb1be4
[CI Pipeline] Released Snapshot version: 5.37.29-alpha-222-SNAPSHOT
Jul 9, 2024
ee27a57
try docker prune
Ian-Nara Jul 9, 2024
366a576
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jul 9, 2024
ea1541c
[CI Pipeline] Released Snapshot version: 5.37.30-alpha-223-SNAPSHOT
Jul 9, 2024
9003adc
try docker prune
Ian-Nara Jul 9, 2024
632708b
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jul 9, 2024
6b57cfe
[CI Pipeline] Released Snapshot version: 5.37.31-alpha-224-SNAPSHOT
Jul 9, 2024
3aea4ba
try docker prune
Ian-Nara Jul 9, 2024
a5880c9
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jul 9, 2024
80c191f
[CI Pipeline] Released Snapshot version: 5.37.32-alpha-225-SNAPSHOT
Jul 9, 2024
7521509
[CI Pipeline] Released Snapshot version: 5.37.33-alpha-111-SNAPSHOT
Jul 9, 2024
15ef714
[CI Pipeline] Released Snapshot version: 5.37.34-alpha-141-SNAPSHOT
Jul 9, 2024
d669f8a
[CI Pipeline] Released Snapshot version: 5.37.35-alpha-86-SNAPSHOT
Jul 9, 2024
b4b5518
check disk usage
Ian-Nara Jul 9, 2024
0c27942
Merge remote-tracking branch 'origin/ian-UID2-3362-upgrade-java-21' i…
Ian-Nara Jul 9, 2024
49ca916
check disk usage
Ian-Nara Jul 9, 2024
f7aa3d2
[CI Pipeline] Released Snapshot version: 5.37.36-alpha-226-SNAPSHOT
Jul 9, 2024
ee3a653
fix typo, improve tests
Ian-Nara Jul 10, 2024
74385b5
change action back to referencing main
Ian-Nara Jul 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/actions/build_aws_eif/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ runs:
run: |
make -f Makefile.nitro ${{ inputs.identity_scope }}operator.eif

- name: Free up space
shell: bash
run: |
echo y | docker system prune -a

- name: Prepare artifacts
id: prepare_artifacts
shell: bash
Expand Down Expand Up @@ -84,5 +89,5 @@ runs:
- name: Cleanup
shell: bash
run: |
docker stop $(docker ps -a -q)
docker system prune -f
docker rm -vf $(docker ps -a -q)
docker rmi -f $(docker images -aq)
2 changes: 2 additions & 0 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ on: [pull_request, push, workflow_dispatch]
jobs:
build:
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-build-and-test.yaml@v2
with:
java_version: 21
secrets: inherit
117 changes: 0 additions & 117 deletions .github/workflows/e2e-azure-cc-enclave.yaml

This file was deleted.

122 changes: 0 additions & 122 deletions .github/workflows/e2e-gcp-oidc-enclave.yaml

This file was deleted.

15 changes: 9 additions & 6 deletions .github/workflows/publish-aws-nitro-enclave-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,13 @@ jobs:
with:
add: 'pom.xml version.json'
message: 'Released ${{ inputs.release_type }} version: ${{ steps.version.outputs.new_version }}'
tag: v${{ steps.version.outputs.new_version }}
tag: v${{ steps.version.outputs.new_version }}

- name: Check disk usage
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's leave these for debugging purpose

shell: bash
run: |
df -h

outputs:
new_version: ${{ steps.version.outputs.new_version }}
is_release: ${{ steps.checkRelease.outputs.is_release }}
Expand Down Expand Up @@ -156,7 +157,7 @@ jobs:

- name: Build UID2 AWS EIF
id: build_uid2_eif
uses: IABTechLab/uid2-operator/.github/actions/build_aws_eif@main
uses: IABTechLab/uid2-operator/.github/actions/build_aws_eif@ian-UID2-3362-upgrade-java-21
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change back to main before merging

with:
identity_scope: uid2
artifacts_base_output_dir: ${{ env.ARTIFACTS_BASE_OUTPUT_DIR }}/uid2
Expand All @@ -177,6 +178,7 @@ jobs:
shell: bash
run: |
df -h

outputs:
uid2_enclave_id: ${{ steps.build_uid2_eif.outputs.enclave_id }}

Expand Down Expand Up @@ -211,10 +213,10 @@ jobs:
shell: bash
run: |
df -h

- name: Build EUID AWS EIF
id: build_euid_eif
uses: IABTechLab/uid2-operator/.github/actions/build_aws_eif@main
uses: IABTechLab/uid2-operator/.github/actions/build_aws_eif@ian-UID2-3362-upgrade-java-21
with:
identity_scope: euid
artifacts_base_output_dir: ${{ env.ARTIFACTS_BASE_OUTPUT_DIR }}/euid
Expand All @@ -235,6 +237,7 @@ jobs:
shell: bash
run: |
df -h

outputs:
euid_enclave_id: ${{ steps.build_euid_eif.outputs.enclave_id }}

Expand All @@ -246,7 +249,7 @@ jobs:
- name: Check disk usage
shell: bash
run: |
df -h
df -h

- name: Download UID2 artifacts
uses: actions/download-artifact@v4
Expand All @@ -257,7 +260,7 @@ jobs:
uses: actions/download-artifact@v4
with:
path: ${{ env.ARTIFACTS_BASE_OUTPUT_DIR }}/euid

- name: Save Enclave Ids
run: |
mkdir -p ${{ env.ARTIFACTS_BASE_OUTPUT_DIR }}/manifests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-azure-cc-enclave-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
java-version: '21'

- name: Checkout full history on Main
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-gcp-oidc-enclave-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
java-version: '21'

- name: Checkout full history on Main
uses: actions/checkout@v4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ jobs:
version_number_input: ${{ inputs.version_number_input }}
force_release: 'no' # Do not create a release for the component builds, will be created by the parent
vulnerability_severity: ${{ inputs.vulnerability_severity }}
java_version: 21
secrets: inherit

e2e:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/validate-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@ jobs:
failure_severity: ${{ inputs.failure_severity || 'CRITICAL,HIGH' }}
fail_on_error: ${{ inputs.fail_on_error || true }}
cloud_provider: 'default'
java_version: 21
secrets: inherit
build-publish-docker-aws:
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@v2
with:
failure_severity: ${{ inputs.failure_severity || 'CRITICAL,HIGH' }}
fail_on_error: ${{ inputs.fail_on_error || true }}
cloud_provider: 'aws'
java_version: 21
secrets: inherit
needs: [build-publish-docker-default]
build-publish-docker-gcp:
Expand All @@ -39,6 +41,7 @@ jobs:
failure_severity: ${{ inputs.failure_severity || 'CRITICAL,HIGH' }}
fail_on_error: ${{ inputs.fail_on_error || true }}
cloud_provider: 'gcp'
java_version: 21
secrets: inherit
needs: [build-publish-docker-aws]
build-publish-docker-azure:
Expand All @@ -47,5 +50,6 @@ jobs:
failure_severity: ${{ inputs.failure_severity || 'CRITICAL,HIGH' }}
fail_on_error: ${{ inputs.fail_on_error || true }}
cloud_provider: 'azure'
java_version: 21
secrets: inherit
needs: [build-publish-docker-gcp]
Loading