Skip to content

Commit

Permalink
Merge pull request #16 from gowizzard/development
Browse files Browse the repository at this point in the history
fix: Update github workflow.
  • Loading branch information
gowizzard authored Feb 22, 2023
2 parents 7db36f0 + 044841a commit 510d967
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/compver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,13 @@ jobs:
with:
fetch-depth: 0

- name: Set repository tag information
id: information
run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}

- name: Get the major version
id: compver
env:
GITHUB_TOKEN: ${{ github.token }}
uses: gowizzard/compver@v5
with:
args: "-core -block major -version1 ${{ steps.information.outputs.tag }}"
args: "-core -block major -version1 ${{ github.ref_name }} -trim -prefix v"

- name: Set git config
run: |
Expand All @@ -39,7 +37,7 @@ jobs:
- name: Merge data from default branch
run: |
git fetch
git checkout v${{ steps.compver.outputs.number }}
git checkout v${{ steps.compver.outputs.core_result }}
git pull
git merge --no-ff "origin/$DEFAULT_BRANCH" -m "$COMMIT_MESSAGE"
git push

0 comments on commit 510d967

Please sign in to comment.