Skip to content

Commit

Permalink
Merge pull request #12 from mato533/release/v1.0.9
Browse files Browse the repository at this point in the history
chore: Release for v1.0.9 (master)
  • Loading branch information
mato533 authored Jun 18, 2023
2 parents 3d4a724 + 3ca8d57 commit 89b5141
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/auto-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Identify the version about to release
id: identify-version
run: |
APP_VERSION="$(echo ${{ github.event.pull_request.title }} |grep -o -E "([0-9]+\.){1}[0-9]+(\.[0-9]+)?" | head -n1)"
APP_VERSION="$(echo '${{ github.event.pull_request.title }}' |grep -o -E "([0-9]+\.){1}[0-9]+(\.[0-9]+)?" | head -n1)"
if [ ! -n "${APP_VERSION}" ]
then
exit 255
Expand Down Expand Up @@ -114,6 +114,8 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Pull the remote branch
run: git pull $(git remote show) ${{ github.ref_name }}
- uses: actions/setup-node@v3
with:
node-version: "18.x"
Expand All @@ -127,7 +129,7 @@ jobs:
- name: Define the pull request title.
id: define-pr-title
run: |
echo "pr_title=chore: Merge the latest release ${{ needs.prepare.outputs.app_version_text }} to develop">>"${GITHUB_OUTPUT}"
echo "pr_title=chore: Merge the latest release ${{ needs.prepare.outputs.app_version_text }} (develop)">>"${GITHUB_OUTPUT}"
- name: Create pull request(for develop)
run: |
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/pre-release-task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ jobs:

steps:
- uses: actions/checkout@v3
- run: git checkout HEAD
- name: Pull the remote branch
run: git pull $(git remote show) ${{ github.ref_name }}
- uses: actions/setup-node@v3
with:
node-version: "18.x"
Expand All @@ -103,7 +104,8 @@ jobs:

steps:
- uses: actions/checkout@v3
- run: git checkout HEAD
- name: Pull the remote branch
run: git pull $(git remote show) ${{ github.ref_name }}
- uses: actions/setup-node@v3
with:
node-version: "18.x"
Expand Down Expand Up @@ -139,6 +141,6 @@ jobs:
run: |
gh pr create \
-B master \
-t "${{ steps.define-pr-title.outputs.pr_title }} (to master)" \
-t "${{ steps.define-pr-title.outputs.pr_title }} (master)" \
-a ${{ github.actor }} \
--body-file ./.github/RELEASE_WORKFLOW_TEMPLATE.md
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ci-test-project",
"version": "1.0.8",
"version": "1.0.9",
"main": "index.js",
"repository": "https://github.com/mato533/test1.git",
"author": "mato533 <[email protected]>",
Expand Down
1 change: 1 addition & 0 deletions test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ CHANGELOG
1.0.8
1.0.8
1.0.8
1.0.9

0 comments on commit 89b5141

Please sign in to comment.