diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index 647ca3f..bbf32de 100644 --- a/.github/workflows/test-and-release.yml +++ b/.github/workflows/test-and-release.yml @@ -78,7 +78,7 @@ jobs: - macos-latest - ubuntu-latest - windows-latest - fail-fast: true + fail-fast: false runs-on: ${{ matrix.os }} steps: - name: Checkout code # have to checkout to have the source code available @@ -126,8 +126,11 @@ jobs: shell: bash run: | [[ "${{ steps.version-prefix.outputs.current-version }}" == "0.0.0" ]] - [[ "${{ steps.version-prefix.outputs.version }}" == "0.0.1" ]] - [[ "${{ steps.version-prefix.outputs.prefixed-version }}" == "foo/bar@0.0.1" ]] + [[ "${{ steps.version-prefix.outputs.major-version }}" == "0" ]] + [[ "${{ steps.version-prefix.outputs.minor-version }}" == "0" ]] + [[ "${{ steps.version-prefix.outputs.patch-version }}" == "1" ]] + [[ "${{ steps.version-prefix.outputs.version }}" = "0.0.1-"* ]] + [[ "${{ steps.version-prefix.outputs.prefixed-version }}" = "foo/bar@0.0.1-"* ]] release: needs: diff --git a/shared.sh b/shared.sh index d1b605a..e1624ce 100644 --- a/shared.sh +++ b/shared.sh @@ -22,14 +22,15 @@ remove_prefix() { if [[ -n "${tag_prefix:-}" ]]; then # Escape special characters in tag_prefix local escaped_prefix - escaped_prefix=$(printf '%s\n' "$tag_prefix" | sed 's/[][\/.^$*]/\\&/g') + escaped_prefix=$(printf '%s\n' "$tag_prefix" | sed 's/[][\/.^$*]/\\&/g') # special chars matched by sed: ] [ / . ^ $ * + # shellcheck disable=SC2143 if [[ -z "$(echo "${tag}" | grep "^${tag_prefix}")" ]] ; then echo "" return fi - # Use | as the delimiter to avoid conflicts with / - echo "${tag}" | sed "s|^${escaped_prefix}||" + # shellcheck disable=SC2001 + echo "${tag}" | sed "s|^${escaped_prefix}||" # Use | as the delimiter to avoid conflicts with / else echo "${tag}" fi