move buildCyclonedxLib to Build the CycloneDX Java library and app used for SBoM generation from build.sh to sbom.sh #3209

julian55455 · 2023-01-10T17:51:28Z

move buildCyclonedxLib to Build the CycloneDX Java library and app used for SBoM generation from build.sh to sbom.sh

…ed for SBoM generation from build.sh to sbom.sh

github-actions · 2023-01-10T17:51:46Z

Thank you for creating a pull request!
If you have not done so already, please familiarise yourself with our Contributing Guidelines and FAQ, even if you have contributed to the Adoptium project before. GitHub actions will now run a set of jobs against your PR that will lint and unit test your changes. Keep an eye out for the results from these on the latest commit you submitted. For more information, please see our testing documentation.

karianna · 2023-01-12T09:52:47Z

@julian55455 you'll need to sign the Eclipse CLA?

karianna · 2023-01-13T19:16:59Z

@julian55455 - Also linter and tests fail

github-actions

A block has been put on this Pull Request as this repository is temporarily under a code freeze due to an ongoing release cycle.

If this pull request needs to be merged during the release cycle then please comment /merge and a PMC member will be able to remove the block.

If the code freeze is over you can remove this block by commenting /thaw.

zdtsw · 2023-01-25T10:09:31Z

you might need to do a rebase first

zdtsw · 2023-01-25T14:59:44Z

will merge it once code frozen is uplifted

zdtsw · 2023-01-26T15:07:07Z

@julian55455 need to resolve conflicts first ^

zdtsw · 2023-01-26T16:59:33Z

/thaw

Pull Request unblocked - code freeze is over.

julian55455 · 2023-02-01T07:32:41Z

@zdtsw are these build failures related to the changes made in this PR?

zdtsw · 2023-02-01T08:05:19Z

@zdtsw are these build failures related to the changes made in this PR?

dont think so, but since both mac failed, i will run one of them and see if it was glitch or not

andrew-m-leonard · 2023-02-01T09:59:37Z

Ah of course the github action does not use --create-sbom...
must be a glitch ?

andrew-m-leonard · 2023-02-01T10:39:16Z

sbin/build.sh

@@ -968,17 +946,17 @@ cleanAndMoveArchiveFiles() {

  echo "Currently at '${PWD}'"

-  local jdkPath=$(ls -d ${BUILD_CONFIG[JDK_PATH]})
+  local jdkPath=$(ls -d "${BUILD_CONFIG[JDK_PATH]}")


This line needs the quotes removing as it relies on glob expansion.
Please can you undo the other " changes above as well

zdtsw · 2023-02-01T12:02:45Z

lets try get this pass test first and merge it, leave the "linter" to issue adoptium/ci-jenkins-pipelines#428 to fix

zdtsw · 2023-02-01T18:28:09Z

Ah of course the github action does not use --create-sbom... must be a glitch ?

think the reason is, we wanna only enable sbom related part from ci-jenkins-pipeline, and decouple from temurin-build.
so the others fork the repo wont need to do anything with sbom.

if we want sbom be in the GH check here, we later will also need to add more logic for the signing keys, can be a bit complicated.

andrew-m-leonard · 2023-02-03T10:40:48Z

@julian55455 For the linter error:

Error: File:[/github/workspace/sbin/build.sh] is not executable
Error: File:[/github/workspace/sbin/common/sbom.sh] is not executable

Try doing a new commit with:
chmod +x sbin/build.sh
chmod +x sbin/common/sbom.sh

You may need to do an arbitrary change in each file to make a commit.

andrew-m-leonard · 2023-02-03T10:43:28Z

sbin/common/sbom.sh

+  # Check if JDK-17 is available, download it if it isn't
+  if [ ! -d "${javaHome}" ]; then
+    # Download JDK-17
+    apiUrlTemplate="https://api.adoptium.net/v3/binary/latest/\${JDK_BOOT_VERSION}/\${releaseType}/linux/\${downloadArch}/jdk/hotspot/normal/\${vendor}"


You don't need these 2 lines:
apiUrlTemplate=...
apiURL=$(eval echo ${apiUrlTemplate})

andrew-m-leonard · 2023-02-03T10:43:46Z

sbin/common/sbom.sh

+    # Download JDK-17
+    apiUrlTemplate="https://api.adoptium.net/v3/binary/latest/\${JDK_BOOT_VERSION}/\${releaseType}/linux/\${downloadArch}/jdk/hotspot/normal/\${vendor}"
+    apiURL=$(eval echo ${apiUrlTemplate})
+    JDK_BOOT_VERSION="17"


Make all these "local" variables

andrew-m-leonard · 2023-02-03T10:46:16Z

sbin/common/sbom.sh

+buildCyclonedxLib() {
+  local javaHome="${1}"
+
+  # Check if JDK-17 is available, download it if it isn't


Move this boot jdk logic to

temurin-build/sbin/build.sh

Line 688 in 18f343c

setupAntEnv() {

agree, i was about to say the logic should be in setupAntEnv()

andrew-m-leonard · 2023-02-03T10:52:43Z

sbin/common/sbom.sh

+    downloadArch="x64"
+    vendor="adoptium"
+    apiURL="https://api.adoptium.net/v3/binary/latest/${JDK_BOOT_VERSION}/${releaseType}/linux/${downloadArch}/jdk/hotspot/normal/${vendor}"
+    echo "Downloading GA release of boot JDK version ${JDK_BOOT_VERSION} from ${apiURL}"


You are missing the actual download..

curl -L "${apiURL}" | tar xpzf - --strip-components=1 -C "$jdkDir"

Set jdkDir variable to be "${CYCLONEDB_DIR}/jdk"
Also add that folder to https://github.com/adoptium/temurin-build/blob/master/.gitignore

Then set javaHome in setupAntEnv()

zdtsw · 2023-02-02T06:35:07Z

sbin/common/sbom.sh

@@ -2,6 +2,9 @@
 # Build the CycloneDX Java library and app used for SBoM generation
 buildCyclonedxLib() {
  local javaHome="${1}"
+  # Download jdk-19 if JAVA_HOME is not set or is older than jdk-19
+  if [[ -z "${JAVA_HOME}" ]] || [[ "$(${JAVA_HOME}/bin/java -version 2>&1 | awk -F '"' '/version/ {print $2}')" < "1.9" ]]; then


an empty block?

zdtsw · 2023-02-03T14:21:00Z

sbin/common/sbom.sh

+buildCyclonedxLib() {
+  local javaHome="${1}"
+
+  # Check if JDK-17 is available, download it if it isn't


agree, i was about to say the logic should be in setupAntEnv()

julian55455 · 2023-03-03T13:59:27Z

fixed in this pr #3243

move buildCyclonedxLib to Build the CycloneDX Java library and app us…

77edde6

…ed for SBoM generation from build.sh to sbom.sh

zdtsw marked this pull request as draft January 16, 2023 13:43

julian55455 added 2 commits January 16, 2023 23:00

fixed lint

481c2f6

Trigger rebuild

8d34d40

github-actions bot previously requested changes Jan 23, 2023

View reviewed changes

zdtsw approved these changes Jan 25, 2023

View reviewed changes

zdtsw marked this pull request as ready for review January 25, 2023 10:07

andrew-m-leonard approved these changes Jan 25, 2023

View reviewed changes

julian55455 and others added 4 commits January 31, 2023 15:02

resolve conflicts

92ee3c2

resolve conflicts

df2638f

Merge branch 'master' into one

3329dc6

resolve conflicts

895a957

andrew-m-leonard requested changes Feb 1, 2023

View reviewed changes

Refactor code

24a0756

julian55455 added 2 commits February 1, 2023 13:44

make the script obtain jdk-19

83188df

make the script build with jdk17

40c86d0

andrew-m-leonard requested changes Feb 3, 2023

View reviewed changes

andrew-m-leonard mentioned this pull request Feb 3, 2023

add the --sign operation of TemurinGenSBOM.java #3211

Closed

zdtsw reviewed Feb 3, 2023

View reviewed changes

andrew-m-leonard mentioned this pull request Feb 3, 2023

Ensure TemurinGenSOM.java build with jdk-17+ for openkeystore support #3236

Closed

julian55455 closed this Mar 3, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

move buildCyclonedxLib to Build the CycloneDX Java library and app used for SBoM generation from build.sh to sbom.sh #3209

move buildCyclonedxLib to Build the CycloneDX Java library and app used for SBoM generation from build.sh to sbom.sh #3209

julian55455 commented Jan 10, 2023 •

edited by zdtsw

Loading

github-actions bot commented Jan 10, 2023

karianna commented Jan 12, 2023

karianna commented Jan 13, 2023

github-actions bot left a comment

zdtsw commented Jan 25, 2023

zdtsw commented Jan 25, 2023

zdtsw commented Jan 26, 2023

zdtsw commented Jan 26, 2023

julian55455 commented Feb 1, 2023

zdtsw commented Feb 1, 2023

andrew-m-leonard commented Feb 1, 2023 •

edited

Loading

andrew-m-leonard Feb 1, 2023

zdtsw commented Feb 1, 2023

zdtsw commented Feb 1, 2023

andrew-m-leonard commented Feb 3, 2023

andrew-m-leonard Feb 3, 2023

andrew-m-leonard Feb 3, 2023

andrew-m-leonard Feb 3, 2023

zdtsw Feb 3, 2023

andrew-m-leonard Feb 3, 2023

andrew-m-leonard Feb 3, 2023

zdtsw Feb 2, 2023

zdtsw Feb 3, 2023

julian55455 commented Mar 3, 2023

move buildCyclonedxLib to Build the CycloneDX Java library and app used for SBoM generation from build.sh to sbom.sh #3209

move buildCyclonedxLib to Build the CycloneDX Java library and app used for SBoM generation from build.sh to sbom.sh #3209

Conversation

julian55455 commented Jan 10, 2023 • edited by zdtsw Loading

github-actions bot commented Jan 10, 2023

karianna commented Jan 12, 2023

karianna commented Jan 13, 2023

github-actions bot left a comment

Choose a reason for hiding this comment

zdtsw commented Jan 25, 2023

zdtsw commented Jan 25, 2023

zdtsw commented Jan 26, 2023

zdtsw commented Jan 26, 2023

julian55455 commented Feb 1, 2023

zdtsw commented Feb 1, 2023

andrew-m-leonard commented Feb 1, 2023 • edited Loading

Choose a reason for hiding this comment

zdtsw commented Feb 1, 2023

zdtsw commented Feb 1, 2023

andrew-m-leonard commented Feb 3, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

julian55455 commented Mar 3, 2023

julian55455 commented Jan 10, 2023 •

edited by zdtsw

Loading

andrew-m-leonard commented Feb 1, 2023 •

edited

Loading