diff --git a/.gitattributes b/.gitattributes index d4a5939..0c48c7e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,5 +4,8 @@ docs/*.md linguist-generated=true # see https://git-scm.com/docs/git-archive/2.40.0#ATTRIBUTES # Exclude a bunch of paths to save some disk space e2e export-ignore -.aspect -.github +.aspect export-ignore +.github export-ignore +pkg/*/testdata export-ignore +tools/release export-ignore + diff --git a/.github/workflows/integrity.jq b/.github/workflows/integrity.jq index d9f98e9..9f981c7 100644 --- a/.github/workflows/integrity.jq +++ b/.github/workflows/integrity.jq @@ -2,20 +2,18 @@ # NB: the sha256 files are expected to be newline-terminated. # # Input looks like -# 48552e399a1f2ab97e62ca7fce5783b6214e284330c7555383f43acf82446636 bazeldnf_linux-amd64\nfd265552bfd236efef519f81ce783322a50d8d7ab5af5d08a713e519cedff87f bazeldnf_linux-arm64\n +# 48552e399a1f2ab97e62ca7fce5783b6214e284330c7555383f43acf82446636 bazeldnf-v0.6.0-rc7-linux-amd64\n... # # Output should look like # { -# "bazeldnf_linux-amd64": "48552e399a1f2ab97e62ca7fce5783b6214e284330c7555383f43acf82446636", -# "bazeldnf_linux-x86_64": "fd265552bfd236efef519f81ce783322a50d8d7ab5af5d08a713e519cedff87f" +# "linux-amd64": "48552e399a1f2ab97e62ca7fce5783b6214e284330c7555383f43acf82446636", +# ... # } . -# Don't end with an empty object +| sub($ARGS.named.PREFIX; ""; "g") | rtrimstr("\n") | split("\n") -| map( - split(" ") - | {"key": .[1], "value": .[0]} - ) +| map(split(" ")) +| map({"key": .[1], "value": .[0]}) | from_entries diff --git a/.github/workflows/release_prep.sh b/.github/workflows/release_prep.sh index d68a38d..0dfcf89 100755 --- a/.github/workflows/release_prep.sh +++ b/.github/workflows/release_prep.sh @@ -30,6 +30,7 @@ PREFIX=$PREFIX ${SCRIPT_DIR}/generate_tools_versions.sh PREBUILTS=$(jq \ --from-file .github/workflows/integrity.jq \ + --arg PREFIX "bazeldnf-${GITHUB_REF_NAME}-" \ --slurp \ --raw-input artifacts/*.sha256 \ ) @@ -37,7 +38,7 @@ PREBUILTS=$(jq \ cat >${PREFIX}/tools/integrity.bzl <