Skip to content

Commit f9c2a24

Browse files
committed
Updating github-config
1 parent 645d62a commit f9c2a24

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

.github/workflows/update-github-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Update shared github-config
22

33
on:
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

88
concurrency: github_config_update

scripts/create.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -o pipefail
66
readonly PROG_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
77
readonly ROOT_DIR="$(cd "${PROG_DIR}/.." && pwd)"
88
readonly 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
1212
source "${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

scripts/receipts.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff 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

0 commit comments

Comments
 (0)