Skip to content

Commit

Permalink
Fix new_tag returning empty in ci (#81)
Browse files Browse the repository at this point in the history
  • Loading branch information
katybaulch authored Feb 22, 2024
1 parent d422d07 commit 469903d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/auto-tag.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -euxo pipefail
set -euo pipefail

script_folder=$(dirname "${BASH_SOURCE[0]}")
source "${script_folder}"/funcs.sh
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: CI

on:
push:
tags: ['v*']
branches:
- main
pull_request:
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
types:
- completed

push:
tags: ['v*']

jobs:
auto-git-and-semver-tag:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -43,11 +40,11 @@ jobs:
PR_NUMBER: '${{ fromJson(steps.get_pr_data.outputs.result).number }}'
run: |
echo "Attempting to auto-tag merge commit"
script_output=$(set -e; .github/auto-tag.sh "${PR_BODY}" "${PR_NUMBER}")
script_output=$(.github/auto-tag.sh "${PR_BODY}" "${PR_NUMBER}")
if $? != 0; then
exit 1
fi
script_output=$(set -e; echo "${new_tag}" | tail -n 1)
script_output=$(echo "${new_tag}" | tail -n 1)
echo "New tag version: ${script_output}"
echo "new_tag=${script_output}" >> "$GITHUB_OUTPUT"
Expand Down

0 comments on commit 469903d

Please sign in to comment.