diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6ca40df..77884a2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,6 +1,7 @@ name: Tests on: + workflow_dispatch: pull_request: branches: - master @@ -53,7 +54,7 @@ jobs: - name: Setup BATS uses: mig4/setup-bats@v1 with: - bats-version: 1.11.1 + bats-version: 1.12.0 - name: Check out code uses: actions/checkout@v4 @@ -87,7 +88,7 @@ jobs: - name: Setup BATS uses: mig4/setup-bats@v1 with: - bats-version: 1.11.1 + bats-version: 1.12.0 - name: Check out code uses: actions/checkout@v4 diff --git a/git-mr b/git-mr index df29ad3..a4d3834 100755 --- a/git-mr +++ b/git-mr @@ -2422,6 +2422,9 @@ mr_update() { matchOldLog="^(${_git_mr_commit_prefix})(${oldSha}) ${msgSuffix}" matchLink="^(${_git_mr_commit_prefix})(\[${oldSha}\]\(${matchOldCommitUrl}\)) ${msgSuffix}" + #local link_icon="🔗" + local link_icon="\xF0\x9F\x94\x97" # Workaround for sed / is_mb_char / mbrtowc bug (Windows) + local consoleShaColor if [[ -n $oldSha ]]; then if [[ $oldSha == "$currSha" ]]; then consoleShaColor="$sameColor"; else @@ -2429,8 +2432,8 @@ mr_update() { consoleShaColor="$newColor"; fi local forConsole_converted forConsole_link forDescription forDescriptionNew - forConsole_converted="\1$(colorize "$currSha" "$consoleShaColor")🔗✔ \3\4${MD_BR}" - forConsole_link="\1$(colorize "$currSha" "$consoleShaColor")🔗 \3\4${MD_BR}" + forConsole_converted="\1$(colorize "$currSha" "$consoleShaColor")${link_icon}✔ \3\4${MD_BR}" + forConsole_link="\1$(colorize "$currSha" "$consoleShaColor")${link_icon} \3\4${MD_BR}" forDescription="\1[$currSha]($(regex_escape "$currCommitUrl")) \3\4${MD_BR}" forDescriptionNew="\1[$currSha]($(regex_escape "$currCommitUrl")) \3" @@ -2467,7 +2470,7 @@ mr_update() { new_commit_line_content="$(echo "$new_commit_line_display" | sed -r -e "s/^(\* \*\*)(${currSha}) (.*)/${forDescriptionNew}/")" # shellcheck disable=SC2001 new_commit_line_display="$(echo "$new_commit_line_display" | - sed -r -e "s/^(\* \*\*)(${currSha}) (.*)$/\1$(colorize "$currSha" "$consoleShaColor")🔗 \3/" + sed -r -e "s/^(\* \*\*)(${currSha}) (.*)$/\1$(colorize "$currSha" "$consoleShaColor")${link_icon} \3/" )" else new_commit_line_display="$(colorize "$currSha" "$consoleShaColor")🔗 ${currMsg}" diff --git a/test/test_helper/bats-assert b/test/test_helper/bats-assert index b93143a..3be0fb7 160000 --- a/test/test_helper/bats-assert +++ b/test/test_helper/bats-assert @@ -1 +1 @@ -Subproject commit b93143a1bfbde41d9b7343aab0d36f3ef6549e6b +Subproject commit 3be0fb7856791b4a64aef7a1336e965f5252e45f diff --git a/test/test_helper/bats-support b/test/test_helper/bats-support index d007fc1..0954abb 160000 --- a/test/test_helper/bats-support +++ b/test/test_helper/bats-support @@ -1 +1 @@ -Subproject commit d007fc1f451abbad55204fa9c9eb3e6ed5dc5f61 +Subproject commit 0954abb9925cad550424cebca2b99255d4eabe96