Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into update-ic
Browse files Browse the repository at this point in the history
  • Loading branch information
bitdivine committed Nov 16, 2023
2 parents 431ef7d + 0d5b5c9 commit f72fb74
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Unreleased

## Features

- Include timestamp and tags in the candid provenance record.

# 2023.10.15-0600Z

## Overview
Expand Down
6 changes: 4 additions & 2 deletions scripts/import-candid
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import_did() {
local out_path="packages/${pkg}/candid/${out_filename}"
echo "Copying ${in_fullpath} -> REPO_ROOT/${out_path}"
{
echo "// Generated from IC repo commit ${IC_COMMIT} '${in_path}' by $(basename "${0}")"
echo "// Generated from IC repo commit ${IC_COMMIT} (${IC_DATE}${IC_TAGS:+ tags: ${IC_TAGS% }}) '${in_path}' by $(basename "${0}")"
cat "$in_fullpath"
} >"${out_path}"
}
Expand Down Expand Up @@ -50,7 +50,9 @@ test -n "${IC_DIR:-}" || {
echo " Use --help for usage."
exit 1
} >&2
IC_COMMIT="$(cd "${IC_DIR}" && git rev-parse HEAD)"
IC_COMMIT="$(cd "${IC_DIR}" && git rev-parse --short HEAD)"
IC_DATE="$(cd "${IC_DIR}" && git show -s --format=%as)"
IC_TAGS="$(cd "${IC_DIR}" && git tag --points-at HEAD | tr "\n" " ")"
THIS_SCRIPT_NAME="$(basename "$0")"

: Import canisters
Expand Down

0 comments on commit f72fb74

Please sign in to comment.