File tree Expand file tree Collapse file tree 2 files changed +17
-1
lines changed
Expand file tree Collapse file tree 2 files changed +17
-1
lines changed Original file line number Diff line number Diff line change @@ -166,6 +166,9 @@ jobs:
166166 # Replace with symlinks to CI branch versions (use absolute path via .ci-tooling)
167167 ln -s "$(pwd)/.ci-tooling/Makefile" released-branch/Makefile
168168 ln -s "$(pwd)/.ci-tooling/scripts" released-branch/scripts
169+ # Copy devbox.json and devbox.lock to released-branch so devbox can set up the environment correctly
170+ cp devbox.json released-branch/
171+ cp devbox.lock released-branch/
169172
170173 - name : Generate GitHub App Token
171174 id : generate_token
Original file line number Diff line number Diff line change @@ -46,6 +46,11 @@ function validate() {
4646 echo " AWS CLI not found. Please install the AWS CLI before running this script."
4747 exit 1
4848 fi
49+ if ! command -v syft & > /dev/null; then
50+ echo " syft not found. Please ensure syft is installed and in PATH."
51+ echo " Current PATH: $PATH "
52+ exit 1
53+ fi
4954 if [ -z " $image_pull_spec " ]; then
5055 echo " Missing image"
5156 usage
@@ -59,8 +64,14 @@ function generate_sbom() {
5964 local platform=$2
6065 local digest=$3
6166 local file_name=$4
67+ local syft_cmd
68+ syft_cmd=$( command -v syft)
69+ if [ -z " $syft_cmd " ]; then
70+ echo " Error: syft command not found in PATH"
71+ return 1
72+ fi
6273 set +Ee
63- syft --platform " $platform " -o " cyclonedx-json" " $image_pull_spec @$digest " > " $file_name "
74+ " $syft_cmd " --platform " $platform " -o " cyclonedx-json" " $image_pull_spec @$digest " > " $file_name "
6475 sbom_return_code=$?
6576 set -Ee
6677 if (( sbom_return_code != 0 )) ; then
@@ -109,6 +120,8 @@ echo "Tag: $tag_name"
109120echo " Platforms:" " ${platforms[@]} "
110121echo " S3 Path: $s3_path "
111122echo " Docker version: $( docker version) "
123+ echo " Syft location: $( command -v syft || echo ' NOT FOUND' ) "
124+ echo " Current PATH: $PATH "
112125
113126for platform in " ${platforms[@]} " ; do
114127 os=${platform%/* }
You can’t perform that action at this time.
0 commit comments