Skip to content

Commit

Permalink
Merge branch 'release/5.219.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Dax the Deployer committed Nov 6, 2024
2 parents c94f176 + 5f95242 commit 998afc9
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 11 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/release_create_tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:

env:
ASANA_PAT: ${{ secrets.GH_ASANA_SECRET }}
GH_TOKEN: ${{ secrets.GT_DAXMOBILE }}

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -33,11 +34,6 @@ 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
1 change: 0 additions & 1 deletion app/version/version-properties

This file was deleted.

2 changes: 1 addition & 1 deletion app/version/version.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION=5.218.1
VERSION=5.219.0
5 changes: 1 addition & 4 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
releaseNotesDefault = "Bug fixes and other improvements"
releaseNotesBodyHeader = "What's new:"
releaseNotesFileBody = "../app/version/release-notes"
appVersionFilePath = "../app/version/version-properties"
appVersionFilePath = "../app/version/version.properties"
firebaseFilePath = "#{ENV["HOME"]}/jenkins_static/com.duckduckgo.mobile.android/ddg-upload-firebase.json"
releaseNotesLocales= ["en-US", "en-GB", "en-CA"]
releaseNotesMaxLength = 500
Expand Down Expand Up @@ -261,13 +261,11 @@ platform :android do
# Checkout all branches are available
sh("git fetch")
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")
sh("git branch")
sh("git submodule update --init --recursive")
sh("git reset --hard")
sh("git clean -f -fxd")
Expand All @@ -287,7 +285,6 @@ platform :android do

# Merge release branch into main and tag it
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 --tags"
Expand Down

0 comments on commit 998afc9

Please sign in to comment.