Skip to content

Commit

Permalink
Fix --skip-config-archive.
Browse files Browse the repository at this point in the history
The --skip-config-archive skips creating the tar.gz of the src/config.
However the changes to how files are collected failed to check this before hardcoding
that the output file should be collected.
  • Loading branch information
Alexander, Michael authored and jlebon committed Nov 28, 2024
1 parent 3347c8b commit 49ce2cb
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/cmd-build
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,10 @@ loose_objs=()
loose_objs+=("commitmeta.json" "ostree-commit-object")
loose_objs+=("manifest-lock.generated.$basearch.json")
# source metadata
loose_objs+=("coreos-assembler-config-git.json" "coreos-assembler-config.tar.gz")
loose_objs+=("coreos-assembler-config-git.json")
if [ "${CONFIG_ARCHIVE}" != 0 ]; then
loose_objs+=("coreos-assembler-config.tar.gz")
fi
mv -vt "${builddir}" "${loose_objs[@]}"
# official more public artifacts; tracked by meta.json
jq -r .images[].path meta.json | xargs mv -vt "${builddir}"
Expand Down

0 comments on commit 49ce2cb

Please sign in to comment.