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.

Sign up for GitHub

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

Support SBOM creation #1087

Merged
merged 6 commits into from
Dec 5, 2024
Merged

Support SBOM creation #1087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
68bb5a0
Add create_sbom input to node-build action
rpoet-jh Dec 2, 2024
d827a09
Remove is_dev input
rpoet-jh Dec 2, 2024
591c46c
Remove sbom before create
rpoet-jh Dec 3, 2024
534252b
Upload sboms to gh release
rpoet-jh Dec 3, 2024
e25cedb
Add -sbom to maven cyclonedx plugin classifier
rpoet-jh Dec 3, 2024
b890392
Update node-build for new sbom filename
rpoet-jh Dec 3, 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
12 changes: 8 additions & 4 deletions .github/actions/node-build/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ inputs:
env_path:
description: 'Path to .env file'
required: true
is_dev:
description: 'Is dev build'
create_sbom:
description: 'Create SBOM'
required: false
default: "false"
default: "true"

runs:
using: composite
Expand All @@ -26,9 +26,13 @@ runs:
working-directory: ${{ inputs.repository_dir }}
env:
ENV_FILE_PATH: ${{ inputs.env_path }}
IS_DEV: ${{ inputs.is_dev }}
CREATE_SBOM: ${{ inputs.create_sbom }}
run: |
export $(grep -v '^[#|SIGNING|PASS_CORE_POLICY]' $ENV_FILE_PATH | xargs -d '\n')
pnpm install --frozen-lockfile
pnpm run build
if [ "CREATE_SBOM" == "true" ]; then
rm -f *-cyclonedx-sbom.json
pnpm run create_sbom
fi
pnpm run build:docker
25 changes: 22 additions & 3 deletions .github/workflows/pass-complete-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,24 @@ jobs:
gh release create "$RELEASE" --repo=eclipse-pass/main --generate-notes
gh release delete "$RELEASE" --repo=eclipse-pass/pass-core || true
gh release create "$RELEASE" --repo=eclipse-pass/pass-core --generate-notes
cp combined/pass-core/pass-core-main/target/classes/META-INF/sbom/application.cdx.json pass-core-main-$RELEASE-cyclonedx-sbom.json
gh release upload "$RELEASE" --repo=eclipse-pass/pass-core pass-core-main-$RELEASE-cyclonedx-sbom.json
gh release delete "$RELEASE" --repo=eclipse-pass/pass-support || true
gh release create "$RELEASE" --repo=eclipse-pass/pass-support --generate-notes
cp combined/pass-support/pass-data-client/target/classes/META-INF/sbom/application.cdx.json pass-data-client-$RELEASE-cyclonedx-sbom.json
gh release upload "$RELEASE" --repo=eclipse-pass/pass-support pass-data-client-$RELEASE-cyclonedx-sbom.json
cp combined/pass-support/pass-deposit-services/deposit-core/target/classes/META-INF/sbom/application.cdx.json deposit-core-$RELEASE-cyclonedx-sbom.json
gh release upload "$RELEASE" --repo=eclipse-pass/pass-support deposit-core-$RELEASE-cyclonedx-sbom.json
cp combined/pass-support/pass-grant-loader/target/classes/META-INF/sbom/application.cdx.json pass-grant-loader-$RELEASE-cyclonedx-sbom.json
gh release upload "$RELEASE" --repo=eclipse-pass/pass-support pass-grant-loader-$RELEASE-cyclonedx-sbom.json
cp combined/pass-support/pass-journal-loader/pass-journal-loader-nih/target/classes/META-INF/sbom/application.cdx.json pass-journal-loader-nih-$RELEASE-cyclonedx-sbom.json
gh release upload "$RELEASE" --repo=eclipse-pass/pass-support pass-journal-loader-nih-$RELEASE-cyclonedx-sbom.json
cp combined/pass-support/pass-nihms-loader/nihms-data-harvest/target/classes/META-INF/sbom/application.cdx.json nihms-data-harvest-$RELEASE-cyclonedx-sbom.json
gh release upload "$RELEASE" --repo=eclipse-pass/pass-support nihms-data-harvest-$RELEASE-cyclonedx-sbom.json
cp combined/pass-support/pass-nihms-loader/nihms-data-transform-load/target/classes/META-INF/sbom/application.cdx.json nihms-data-transform-load-$RELEASE-cyclonedx-sbom.json
gh release upload "$RELEASE" --repo=eclipse-pass/pass-support nihms-data-transform-load-$RELEASE-cyclonedx-sbom.json
cp combined/pass-support/pass-notification-service/target/classes/META-INF/sbom/application.cdx.json pass-notification-service-$RELEASE-cyclonedx-sbom.json
gh release upload "$RELEASE" --repo=eclipse-pass/pass-support pass-notification-service-$RELEASE-cyclonedx-sbom.json
env:
GITHUB_TOKEN: ${{ secrets.JAVA_RELEASE_PAT }}

Expand All @@ -183,7 +199,9 @@ jobs:

- name: Push Release Docker images to GHCR ~ pass-ui
if: ${{ ! env.PASS_UI_TAG_EXISTS }}
run: docker push ghcr.io/eclipse-pass/pass-ui:$RELEASE
run: |
docker push ghcr.io/eclipse-pass/pass-ui:$RELEASE
cp combined/pass-ui/pass-ui-$RELEASE-cyclonedx-sbom.json pass-ui-$RELEASE-cyclonedx-sbom.json

- name: Set Snapshot/commit ~ pass-ui
if: ${{ ! env.PASS_UI_TAG_EXISTS }}
Expand All @@ -200,7 +218,6 @@ jobs:
with:
repository_dir: combined/pass-ui
env_path: ../pass-docker/.env
is_dev: "true"

- name: Push Snapshot Docker images to GHCR ~ pass-ui
if: ${{ ! env.PASS_UI_TAG_EXISTS }}
Expand All @@ -212,7 +229,9 @@ jobs:

- name: Create GitHub main release ~ pass-ui
if: ${{ ! env.PASS_UI_TAG_EXISTS }}
run: gh release create "$RELEASE" --repo=eclipse-pass/pass-ui --generate-notes
run: |
gh release create "$RELEASE" --repo=eclipse-pass/pass-ui --generate-notes
gh release upload "$RELEASE" --repo=eclipse-pass/pass-ui pass-ui-$RELEASE-cyclonedx-sbom.json
env:
GITHUB_TOKEN: ${{ secrets.JAVA_RELEASE_PAT }}

Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@
<outputDirectory>${project.build.outputDirectory}/META-INF/sbom</outputDirectory>
<outputFormat>json</outputFormat>
<outputName>application.cdx</outputName>
<classifier>cyclonedx-sbom</classifier>
</configuration>
</execution>
</executions>
Expand Down
Loading