Skip to content

Commit

Permalink
Merge branch 'release/5.224.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Jan 15, 2025
2 parents 0c100be + 2abfe73 commit cffbbb0
Show file tree
Hide file tree
Showing 144 changed files with 3,777 additions and 6,689 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/ads-end-to-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,14 @@ jobs:
run: find . -name "*.apk" -exec mv '{}' apk/release.apk \;

- name: ADS Preview Flows
uses: mobile-dev-inc/action-maestro-cloud@v1.8.1
uses: mobile-dev-inc/action-maestro-cloud@v1.9.7
with:
api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
name: ${{ github.sha }}
api-key: ${{ secrets.ROBIN_API_KEY }}
project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
name: androidDesignSystem_${{ github.sha }}
timeout: 120
app-file: apk/release.apk
android-api-level: 30
workspace: .maestro
include-tags: androidDesignSystemTest

Expand All @@ -71,5 +74,5 @@ jobs:
asana-workspace-id: ${{ secrets.GH_ASANA_WORKSPACE_ID }}
asana-project-id: ${{ secrets.GH_ASANA_AOR_PROJECT_ID }}
asana-section-id: ${{ secrets.GH_ASANA_INCOMING_ID }}
asana-task-name: GH Workflow Failure - ADS Preview test
asana-task-name: GH Workflow Failure - ADS Preview test (Robin)
asana-task-description: The ADS Preview end to end workflow has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
66 changes: 66 additions & 0 deletions .github/workflows/build-ad-hoc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: Build - Ad-hoc release

on:
workflow_dispatch:
inputs:
ref:
description: 'Ref to build APK from (branch, tag, commit)'
required: true

env:
ASANA_PAT: ${{ secrets.GH_ASANA_SECRET }}
GOOGLE_APPLICATION_CREDENTIALS: '#{ENV["HOME"]}/jenkins_static/com.duckduckgo.mobile.android/ddg-upload-firebase.json'
GH_TOKEN: ${{ secrets.GT_DAXMOBILE }}

jobs:
build-apk:
name: Generate and upload universal APK to GH Action Run
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
submodules: recursive
token: ${{ secrets.GT_DAXMOBILE }}
ref: ${{ github.event.inputs.ref }}

- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'

- name: Create folder
if: always()
run: mkdir apk

- name: Decode keys
uses: davidSchuppa/base64Secret-toFile-action@v2
with:
secret: ${{ secrets.FAKE_RELEASE_PROPERTIES }}
fileName: ddg_android_build.properties
destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/

- name: Decode key file
uses: davidSchuppa/base64Secret-toFile-action@v2
with:
secret: ${{ secrets.FAKE_RELEASE_KEY }}
fileName: android
destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3

- name: Assemble release APK
run: ./gradlew assemblePlayRelease -Pforce-default-variant

- name: Move APK to new folder
run: find . -name "*.apk" -exec mv '{}' apk/release.apk \;

- name: Upload debug apk
if: always()
uses: actions/upload-artifact@v4
with:
name: release
path: apk/release.apk
10 changes: 6 additions & 4 deletions .github/workflows/custom-tabs-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@ jobs:
run: find . -name "*.apk" -exec mv '{}' apk/release.apk \;

- name: Custom Tabs Flows
uses: mobile-dev-inc/action-maestro-cloud@v1.8.1
uses: mobile-dev-inc/action-maestro-cloud@v1.9.7
with:
api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
name: ${{ github.sha }}
api-key: ${{ secrets.ROBIN_API_KEY }}
project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
name: customTabs_${{ github.sha }}
timeout: 120
app-file: apk/release.apk
android-api-level: 30
workspace: .maestro
Expand All @@ -72,6 +74,6 @@ jobs:
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
asana-project: ${{ vars.GH_ANDROID_APP_PROJECT_ID }}
asana-section: ${{ vars.GH_ANDROID_APP_INCOMING_SECTION_ID }}
asana-task-name: GH Workflow Failure - Custom Tabs Flows
asana-task-name: GH Workflow Failure - Custom Tabs Flows (Robin)
asana-task-description: The Custom Tabs nightly workflow has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
action: 'create-asana-task'
10 changes: 6 additions & 4 deletions .github/workflows/e2e-nightly-autofill.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@ jobs:
run: find . -name "*.apk" -exec mv '{}' apk/release.apk \;

- name: Autofill Critical Path E2E Flows
uses: mobile-dev-inc/action-maestro-cloud@v1.8.1
uses: mobile-dev-inc/action-maestro-cloud@v1.9.7
with:
api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
name: ${{ github.sha }}
api-key: ${{ secrets.ROBIN_API_KEY }}
project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
name: autofill_${{ github.sha }}
timeout: 120
app-file: apk/release.apk
android-api-level: 30
workspace: .maestro
Expand All @@ -72,6 +74,6 @@ jobs:
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
asana-project: ${{ vars.GH_ANDROID_APP_PROJECT_ID }}
asana-section: ${{ vars.GH_ANDROID_APP_INCOMING_SECTION_ID }}
asana-task-name: GH Workflow Failure - Autofill Critical Path E2E Flows
asana-task-name: GH Workflow Failure - Autofill Critical Path E2E Flows (Robin)
asana-task-description: Autofill critical path tests have failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
action: 'create-asana-task'
119 changes: 0 additions & 119 deletions .github/workflows/end-to-end.yml

This file was deleted.

17 changes: 11 additions & 6 deletions .github/workflows/privacy-dashboard-end-to-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,25 @@ jobs:
run: find . -name "*.apk" -exec mv '{}' apk/release.apk \;

- name: Ad click detection flows
uses: mobile-dev-inc/action-maestro-cloud@v1.8.1
uses: mobile-dev-inc/action-maestro-cloud@v1.9.7
with:
api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
name: ${{ github.sha }}
api-key: ${{ secrets.ROBIN_API_KEY }}
project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
name: privacyDashboard_adClickTest_${{ github.sha }}
timeout: 120
app-file: apk/release.apk
android-api-level: 30
workspace: .maestro
include-tags: adClickTest

- name: Privacy Tests
if: always()
uses: mobile-dev-inc/action-maestro-cloud@v1.8.1
uses: mobile-dev-inc/action-maestro-cloud@v1.9.7
with:
api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
name: ${{ github.sha }}
api-key: ${{ secrets.ROBIN_API_KEY }}
project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
name: privacyDashboard_privacyTest_${{ github.sha }}
timeout: 120
app-file: apk/release.apk
workspace: .maestro
include-tags: privacyTest
24 changes: 23 additions & 1 deletion .github/workflows/release_create_tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
env:
ASANA_PAT: ${{ secrets.GH_ASANA_SECRET }}
GH_TOKEN: ${{ secrets.GT_DAXMOBILE }}
emoji_info: ":information_source:" # ℹ️

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down Expand Up @@ -46,6 +47,16 @@ jobs:
run: |
bundle exec fastlane android tag_and_push_release_version app_version:${{ github.event.inputs.app-version }}
- name: Notify Mattermost
id: send-mm-message
uses: duckduckgo/[email protected]
with:
mattermost-token: ${{ secrets.MM_AUTH_TOKEN }}
mattermost-team-id: ${{ secrets.MM_TEAM_ID }}
mattermost-channel-name: ${{ vars.MM_RELEASE_NOTIFY_CHANNEL }}
mattermost-message: ${{env.emoji_start}} Release ${{ github.event.inputs.app-version }}. Tag created.
action: 'send-mattermost-message'

- name: Create Asana task when workflow failed
if: ${{ failure() }}
id: create-failure-task
Expand All @@ -56,4 +67,15 @@ jobs:
asana-section: ${{ vars.GH_ANDROID_APP_INCOMING_SECTION_ID }}
asana-task-name: GH Workflow Failure - Tag Android Release
asana-task-description: Tag Android Release has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
action: 'create-asana-task'
action: 'create-asana-task'

- name: Notify Mattermost when workflow failed
if: ${{ failure() }}
id: send-mm-message-error
uses: duckduckgo/[email protected]
with:
mattermost-token: ${{ secrets.MM_AUTH_TOKEN }}
mattermost-team-id: ${{ secrets.MM_TEAM_ID }}
mattermost-channel-name: ${{ vars.MM_RELEASE_NOTIFY_CHANNEL }}
mattermost-message: ${{env.emoji_start}} Tag Android Release has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
action: 'send-mattermost-message'
Loading

0 comments on commit cffbbb0

Please sign in to comment.