Skip to content

Commit

Permalink
fix: squash in subtree split
Browse files Browse the repository at this point in the history
  • Loading branch information
WoozyMasta committed May 9, 2023
1 parent f879e96 commit 6469688
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ itself. For example `4.9.1-1.0.1`
<!-- Links -->
[Archi]: https://github.com/archimatetool/archi "Archi: ArchiMate Modelling Tool"
<!-- Version compare links -->
[Unreleased]: https://github.com/WoozyMasta/archimate-ci-image/compare/4.9.1-1.0.2...HEAD
[Unreleased]: https://github.com/WoozyMasta/archimate-ci-image/compare/5.0.2-1.0.4...HEAD
[5.0.2-1.0.4]: https://github.com/WoozyMasta/archimate-ci-image/compare/4.9.2-1.0.3...5.0.2-1.0.4
[4.9.2-1.0.3]: https://github.com/WoozyMasta/archimate-ci-image/compare/4.9.1-1.0.2...4.9.2-1.0.3
[4.9.1-1.0.2]: https://github.com/WoozyMasta/archimate-ci-image/compare/4.9.1-1.0.1...4.9.1-1.0.2
[4.9.1-1.0.1]: https://github.com/WoozyMasta/archimate-ci-image/compare/4.9.1-1.0...4.9.1-1.0.1
[4.9.1-1.0]: https://github.com/WoozyMasta/archimate-ci-image/tree/4.9.1-1.0
2 changes: 1 addition & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ if [ "${GITHUB_ACTIONS:-}" == true ]; then
git commit --message "Archimate report ${GITHUB_ACTION:-0}:${GITHUB_JOB:-0}"

_subtree="$(
git subtree split --squash --prefix "$GIT_SUBTREE_PREFIX" "$GITHUB_REF_NAME"
git subtree split --prefix "$GIT_SUBTREE_PREFIX" "$GITHUB_REF_NAME"
)"
git push origin "$_subtree:$GITHUB_PAGES_BRANCH" --force

Expand Down

0 comments on commit 6469688

Please sign in to comment.