Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/auto_release_docs_pr' into auto_…
Browse files Browse the repository at this point in the history
…release_docs_pr

# Conflicts:
#	.github/workflows/tagpr.yaml
#	justfile
  • Loading branch information
cuisongliu committed Nov 27, 2023
2 parents e4ebf23 + 073d661 commit 4fb2c65
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/tagpr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Trigger Release Workflow(only when tagged)
uses: actions/github-script@v6
if: "steps.tagpr.outputs.tag != ''"
if: "steps.tagpr.outputs.tag != '' && steps.tagpr.outputs.tag != 'v0.3.0'"
with:
script: |
github.rest.actions.createWorkflowDispatch({
Expand Down
3 changes: 3 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,9 @@ ci-musl-prepare: ci-prepare
version-up version:
#!/usr/bin/bash
set -ex
if [[ "{{version}}" == "0.3.0" ]]; then
return
fi
git grep -l "^version = .* # MARK: Version" | xargs sed -i 's/version = "[0-9]\.[0-9]\.[0-9]" # MARK: Version/version = "{{version}}" # MARK: Version/g'
git grep -l "} # MARK: Version" | grep -v justfile | xargs sed -i 's/version = "[0-9]\.[0-9]\.[0-9]" } # MARK: Version/version = "{{version}}" } # MARK: Version/g'
{{ cwd }}/scripts/release_tag.sh {{version}}

0 comments on commit 4fb2c65

Please sign in to comment.