Skip to content

Commit 66e22e7

Browse files
Revert "Update release.yml (#727)" (#728)
This reverts commit 8567c49.
1 parent 029a1f4 commit 66e22e7

File tree

1 file changed

+3
-35
lines changed

1 file changed

+3
-35
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ jobs:
5151
runs-on: ubuntu-latest
5252
env:
5353
GITHUB_TOKEN: ${{ secrets.OR_GITHUB_TOKEN }}
54-
BRANCH_NAME: npm-version-patch
5554
steps:
5655

5756
# CHECKOUT PROJECT
@@ -77,7 +76,7 @@ jobs:
7776
if [ ${{ inputs.dev }} == true ]; then
7877
echo "TAG_NAME=$(npm version prerelease --preid=${{ inputs.jsTag }} --no-git-tag-version --allow-same-version)" >> $GITHUB_ENV
7978
else
80-
echo "TAG_NAME=$(npm version patch --no-git-tag-version)" >> $GITHUB_ENV
79+
echo "TAG_NAME=$(npm version patch)" >> $GITHUB_ENV
8180
fi
8281
8382
# DOWNLOAD CLI IF IT IS A DEV VERSION AND A CLI TAG WAS PROVIDED
@@ -94,42 +93,11 @@ jobs:
9493
npm ci
9594
npm run build
9695
97-
# CREATE PR FOR VERSION
98-
- name: Create Pull Request
99-
id: create_pr
100-
if: inputs.dev == false
101-
uses: peter-evans/[email protected]
102-
with:
103-
token: ${{ env.GITHUB_TOKEN }}
104-
branch: ${{ env.BRANCH_NAME }}
105-
title: "Update Version - Automated Changes"
106-
body: "This is an automated PR created by GitHub Actions"
107-
base: main
108-
draft: false
109-
110-
# WAIT FOR PR CREATION
111-
- name: Wait for PR to be created
112-
id: pr
113-
if: inputs.dev == false
114-
uses: octokit/[email protected]
115-
with:
116-
route: GET /repos/${{ github.repository }}/pulls?head=${{ github.repository_owner }}:${{ env.BRANCH_NAME }}
117-
118-
# MERGE PR TO MAIN
119-
- name: Merge Pull Request
120-
if: inputs.dev == false
121-
uses: octokit/[email protected]
122-
with:
123-
route: PUT /repos/${{ github.repository }}/pulls/${{ steps.create_pr.outputs.pull-request-number }}/merge
124-
merge_method: squash
12596
12697
# PUSH TAGS IF IT IS A RELEASE
127-
- name: Push tag
98+
- name: Push tag if release
12899
if: inputs.dev == false
129-
run: |
130-
git pull
131-
git tag ${{env.TAG_NAME}}
132-
git push --tags
100+
run: git push && git push --tags
133101

134102

135103
# PUBLISH NPM PACKAGE

0 commit comments

Comments
 (0)