Skip to content

fix: GitHub action write protected branch 11 #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a0c2d1b
chore: dummy commit
wphyojpl Oct 2, 2023
a1ab3a5
Merge branch 'develop-2023-10-02' of github.com:unity-sds/unity-data-…
wphyojpl Oct 2, 2023
bb16dad
fix: protected-branch error
wphyojpl Oct 2, 2023
3ad72f6
Merge branch 'develop-2023-10-02' of github.com:unity-sds/unity-data-…
wphyojpl Oct 2, 2023
8fb130b
fix: wrong version
wphyojpl Oct 2, 2023
a0357af
fix: using pat token + shell script
wphyojpl Oct 2, 2023
88da687
chore: from develop
wphyojpl Oct 2, 2023
0a5246c
Merge branch 'develop-2023-10-02' of github.com:unity-sds/unity-data-…
wphyojpl Oct 2, 2023
8962f4e
fix: checking ENV
wphyojpl Oct 2, 2023
10c72a0
fix: revert some changes
wphyojpl Oct 2, 2023
c751179
chore: merge from develop
wphyojpl Oct 2, 2023
478a633
Merge branch 'develop-2023-10-02' of github.com:unity-sds/unity-data-…
wphyojpl Oct 2, 2023
a15f005
fix: still debugging
wphyojpl Oct 2, 2023
43a6c3d
Merge branch 'develop-2023-10-02' of github.com:unity-sds/unity-data-…
wphyojpl Oct 2, 2023
ffea60b
chore: dummy commit
wphyojpl Oct 2, 2023
38376ce
chore: update version + change log
wphyojpl Oct 2, 2023
41283ac
chore: update version + change log
wphyojpl Oct 2, 2023
6c42be2
chore: update version + change log
wphyojpl Oct 2, 2023
e8746b6
chore: update version + change log
wphyojpl Oct 2, 2023
422ab2b
chore: update version + change log
wphyojpl Oct 2, 2023
bfce403
chore: merge from develop
wphyojpl Oct 2, 2023
b14ac10
Merge branch 'develop-2023-10-02' into github-action-write-protected-…
wphyojpl Oct 2, 2023
9e5aa5b
fix: adding GH_token
wphyojpl Oct 2, 2023
f3c2e82
fix; displaying env for debug
wphyojpl Oct 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/pr_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ env:
PR_NUMBER: ${{ github.event.number }}
PR_TITLE: ${{ github.event.pull_request.title }}
PAT_TOKEN: ${{ secrets.PAT_SECRET }}
GH_TOKEN: ${{ github.token }}
jobs:
if_merged:
if: github.event.pull_request.merged == true
Expand Down
5 changes: 3 additions & 2 deletions ci.cd/update_version_commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ current_branch='develop-2023-10-02'
temp_branch="chore-version-update"
commit_message="chore: update version + change log"

env

git stash
git checkout -b ${temp_branch}
git stash pop
Expand All @@ -20,5 +22,4 @@ echo ${pr_number}
#gh pr review $pr_number --approve
# hi
gh pr merge $pr_number --squash --admin
git branch -D ${temp_branch}

git push origin --delete ${temp_branch}