Skip to content

Commit

Permalink
using proper branches
Browse files Browse the repository at this point in the history
  • Loading branch information
malmstein committed Oct 24, 2024
1 parent 137b26b commit 4429e39
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/release_create_tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ jobs:
ruby-version: 2.7.2
bundler-cache: true

- name: Set Git permissions
uses: oleksiyrudenko/gha-git-credentials@v2-latest
with:
token: '${{ secrets.GT_DAXMOBILE }}'

- name: Use fastlane lane to create and push tagged release
id: create_git_tag
run: |
Expand Down
16 changes: 8 additions & 8 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -257,13 +257,13 @@ platform :android do

# Checkout all branches are available
sh("git fetch")
sh("git checkout main_test")
sh("git checkout main")
sh("git branch")
sh("git submodule update --init --recursive")
sh("git reset --hard")
sh("git clean -f -fxd")

sh("git checkout develop_test")
sh("git checkout develop")
sh("git branch")
sh("git submodule update --init --recursive")
sh("git reset --hard")
Expand All @@ -283,18 +283,18 @@ platform :android do
sh "git push origin #{branch_name}"

# Merge release branch into main and tag it
sh "git checkout main_test"
sh "git pull origin main_test"
sh "git checkout main"
sh "git pull origin main"
sh "git merge --no-ff release/#{app_version}"
sh "git tag -a #{app_version} -m #{app_version}"
sh "git push origin main_test --tags"
sh "git push origin main --tags"
UI.header("#{app_version} tag has been successfully created. 🎉")

# Merge changes into develop
sh "git checkout develop_test"
sh "git pull origin develop_test"
sh "git checkout develop"
sh "git pull origin develop"
sh "git merge --no-ff release/#{app_version}"
sh "git push origin develop_test"
sh "git push origin develop"

# Clean up branches
sh "git push -d origin release/#{app_version}"
Expand Down

0 comments on commit 4429e39

Please sign in to comment.