Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 13 additions & 3 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ jobs:
is_new,
stack_type,
pattern_image_registry_name,
pattern_assets_prefix
pattern_assets_prefix,
no_stack_id
})')

stacks=$(jq -c <<< "$stacks" )
Expand Down Expand Up @@ -637,8 +638,17 @@ jobs:
- name: Create stack ${{ matrix.stacks.name }}
id: create-stack
run: |
scripts/create.sh --stack-dir ${{ matrix.stacks.config_dir }} \
--build-dir ${{ matrix.stacks.output_dir }}

args=(
--stack-dir ${{ matrix.stacks.config_dir }}
--build-dir ${{ matrix.stacks.output_dir }}
)

if [[ "${{ matrix.stacks.no_stack_id }}" == "true" ]]; then
args+=("--no-stack-id")
fi

scripts/create.sh "${args[@]}"

- name: Generate Package Receipts
id: receipts
Expand Down
16 changes: 13 additions & 3 deletions .github/workflows/test-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ jobs:
name,
config_dir,
output_dir,
create_build_image})')
create_build_image,
no_stack_id})')

stacks=$(jq -c <<< "$stacks" )
echo "stacks=$stacks"
Expand All @@ -65,8 +66,17 @@ jobs:
- name: Create stack ${{ matrix.stacks.name }}
id: create-stack
run: |
scripts/create.sh --stack-dir ${{ matrix.stacks.config_dir }} \
--build-dir ${{ matrix.stacks.output_dir }}
args=(
--stack-dir ${{ matrix.stacks.config_dir }}
--build-dir ${{ matrix.stacks.output_dir }}
)

if [[ "${{ matrix.stacks.no_stack_id }}" == "true" ]]; then
args+=("--no-stack-id")
fi

scripts/create.sh "${args[@]}"


- name: Upload run image
uses: actions/upload-artifact@v4
Expand Down
10 changes: 10 additions & 0 deletions scripts/create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ function main() {
local stack_dir_name build_dir_name
stack_dir_name=""
build_dir_name=""
no_stack_id="false"

while [[ "${#}" != 0 ]]; do
case "${1}" in
Expand Down Expand Up @@ -52,6 +53,11 @@ function main() {
shift 2
;;

--no-stack-id)
no_stack_id="true"
shift 1
;;

"")
# skip if the argument is empty
shift 1
Expand Down Expand Up @@ -127,6 +133,10 @@ function stack::create() {
--run-output "${build_dirpath}/run.oci"
)

if [[ "${no_stack_id}" == "true" ]]; then
args+=("--no-stack-id")
fi

args+=("${flags[@]}")

jam create-stack "${args[@]}"
Expand Down
4 changes: 3 additions & 1 deletion scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,11 @@ function main() {
while read -r image; do
config_dir=$(echo "${image}" | jq -r '.config_dir')
output_dir=$(echo "${image}" | jq -r '.output_dir')
no_stack_id=$(echo "${image}" | jq -r '.no_stack_id // false')
"${ROOT_DIR}/scripts/create.sh" \
--stack-dir "${config_dir}" \
--build-dir "${output_dir}"
--build-dir "${output_dir}" \
--no-stack-id "${no_stack_id}"
done <<<"$STACK_IMAGES"
else
util::print::title "Stack builds already exist..."
Expand Down
Loading