Skip to content
This repository has been archived by the owner on Apr 4, 2024. It is now read-only.

Commit

Permalink
feat :: Move Ver sion To Main, Release ID 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
HongSJae committed Oct 9, 2023
1 parent 2a061f2 commit 2fffec6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/MoveVersionToMainBranch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:

- name: git merge to main
run: |
git config --global user.name 'hongsjae'
git config --global user.email 'gtw030488w@gmail.com'
git config --global user.name 'Team return'
git config --global user.email 'team.return@gmail.com'
git config pull.rebase false
git checkout -t origin/master
echo $(git merge -Xtheirs origin/release -m "🚀 :: Deploy version ${{ env.RELEASE_VERSION }} to AppStore")
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/MoveVersionToReleaseBranch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:

- name: git merge to release
run: |
git config --global user.name 'hongsjae'
git config --global user.email 'gtw030488@gmail.com'
git config --global user.name 'Team return'
git config --global user.email 'team.return@gmail.com'
git config pull.rebase false
git checkout -t origin/release
echo $(git merge -Xtheirs origin/develop)
Expand Down

0 comments on commit 2fffec6

Please sign in to comment.