File tree Expand file tree Collapse file tree 3 files changed +6
-8
lines changed
Expand file tree Collapse file tree 3 files changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ name: Update shared github-config
22
33on :
44 schedule :
5- - cron : ' 44 3 * * *' # daily at 3:44 AM UTC
5+ - cron : ' 44 3 * * *' # daily at 3:44 AM UTC
66 workflow_dispatch : {}
77
88concurrency : github_config_update
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ set -o pipefail
66readonly PROG_DIR=" $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd) "
77readonly ROOT_DIR=" $( cd " ${PROG_DIR} /.." && pwd) "
88readonly BIN_DIR=" ${ROOT_DIR} /.bin"
9- readonly IMAGES_JSON=" ${ROOT_DIR} /stacks/ images.json"
9+ readonly IMAGES_JSON=" ${ROOT_DIR} /images.json"
1010
1111# shellcheck source=SCRIPTDIR/.util/tools.sh
1212source " ${PROG_DIR} /.util/tools.sh"
@@ -67,7 +67,9 @@ function main() {
6767 if [ -f " ${IMAGES_JSON} " ]; then
6868 # we need to copy images.json for inclusion in the build image
6969 defaultStackPath=$( jq -r ' .images[] | select(.name == "default") | .config_dir' " ${IMAGES_JSON} " )
70- cp $IMAGES_JSON $ROOT_DIR /$defaultStackPath /images.json
70+ if [ -n " $defaultStackPath " ]; then
71+ cp $IMAGES_JSON " ${ROOT_DIR} /${defaultStackPath} /images.json"
72+ fi
7173 fi
7274
7375 # if stack or build argument is provided but not both, then throw an error
Original file line number Diff line number Diff line change @@ -152,11 +152,7 @@ function receipts::generate::multi::arch() {
152152 fileName=$( basename ${runOutput} )
153153 fi
154154
155- if [ $imageArch = " amd64" ]; then
156- imageReceipt=" ${dir} /${fileName} "
157- else
158- imageReceipt=" ${dir} /${imageArch} -${fileName} "
159- fi
155+ imageReceipt=" ${dir} /${imageArch} -${fileName} "
160156
161157 util::print::info " Generating CycloneDX package SBOM using syft for $archiveName on platform linux/$imageArch saved as $imageReceipt "
162158
You can’t perform that action at this time.
0 commit comments