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
6 changes: 5 additions & 1 deletion .github/workflows/crux-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ jobs:
git config user.name "hive-release[bot]"
git config user.email "hive-release@hive.kubestellar.io"
git add -A
# .hive-sync carries a timestamp, so it alone is not a change worth a commit.
if [ "$(git diff --cached --name-only)" = ".hive-sync" ]; then
git restore --staged --worktree .hive-sync
fi
if git diff --cached --quiet; then
echo "changed=false" >> "$GITHUB_OUTPUT"
echo "Publish tree already matches hive@${HIVE_SHA:0:12}; nothing to commit." | tee -a "$GITHUB_STEP_SUMMARY"
Expand All @@ -131,7 +135,7 @@ jobs:
-m "Module path rewritten github.com/hivecommons/hive/crux -> github.com/hivecommons/crux by src/scripts/crux-publish.sh. File issues and pull requests in hivecommons/hive."
echo "changed=true" >> "$GITHUB_OUTPUT"
echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
git --no-pager show --stat HEAD | head -40
git --no-pager show --shortstat --format="%H %s" HEAD

- name: Upload publish tree
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
Expand Down
2 changes: 2 additions & 0 deletions changelog.d/fixed-14138-crux-sync-sigpipe.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- The `crux-sync` workflow no longer aborts after committing the publish tree: the commit summary was piped through `head`, which under `pipefail` turned into exit 141 on a large first sync (#14138).
- `crux-sync` no longer commits when the only difference is the `.hive-sync` timestamp, so tag-only runs and re-dispatches do not add empty syncs (#14138).
Loading