Skip to content

Commit 737fb20

Browse files
authored
GHA: Clean up tag workflow (#5246)
Task/Issue URL: https://app.asana.com/0/488551667048375/1208707081604791 ### Description ### Steps to test this PR https://github.com/duckduckgo/Android/actions/runs/11706637463
1 parent 072e269 commit 737fb20

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

.github/workflows/release_create_tag.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010

1111
env:
1212
ASANA_PAT: ${{ secrets.GH_ASANA_SECRET }}
13+
GH_TOKEN: ${{ secrets.GT_DAXMOBILE }}
1314

1415
concurrency:
1516
group: ${{ github.workflow }}-${{ github.ref }}
@@ -33,11 +34,6 @@ jobs:
3334
ruby-version: 2.7.2
3435
bundler-cache: true
3536

36-
- name: Set Git permissions
37-
uses: oleksiyrudenko/gha-git-credentials@v2-latest
38-
with:
39-
token: '${{ secrets.GT_DAXMOBILE }}'
40-
4137
- name: Use fastlane lane to create and push tagged release
4238
id: create_git_tag
4339
run: |

fastlane/Fastfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,13 +261,11 @@ platform :android do
261261
# Checkout all branches are available
262262
sh("git fetch")
263263
sh("git checkout main")
264-
sh("git branch")
265264
sh("git submodule update --init --recursive")
266265
sh("git reset --hard")
267266
sh("git clean -f -fxd")
268267

269268
sh("git checkout develop")
270-
sh("git branch")
271269
sh("git submodule update --init --recursive")
272270
sh("git reset --hard")
273271
sh("git clean -f -fxd")
@@ -287,7 +285,6 @@ platform :android do
287285

288286
# Merge release branch into main and tag it
289287
sh "git checkout main"
290-
sh "git pull origin main"
291288
sh "git merge --no-ff release/#{app_version}"
292289
sh "git tag -a #{app_version} -m #{app_version}"
293290
sh "git push origin main --tags"

0 commit comments

Comments
 (0)