Skip to content

Commit cffbbb0

Browse files
github-actions[bot]github-actions[bot]
committed
Merge branch 'release/5.224.0'
2 parents 0c100be + 2abfe73 commit cffbbb0

File tree

144 files changed

+3777
-6689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+3777
-6689
lines changed

‎.github/workflows/ads-end-to-end.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,14 @@ jobs:
5555
run: find . -name "*.apk" -exec mv '{}' apk/release.apk \;
5656

5757
- name: ADS Preview Flows
58-
uses: mobile-dev-inc/action-maestro-cloud@v1.8.1
58+
uses: mobile-dev-inc/action-maestro-cloud@v1.9.7
5959
with:
60-
api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
61-
name: ${{ github.sha }}
60+
api-key: ${{ secrets.ROBIN_API_KEY }}
61+
project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
62+
name: androidDesignSystem_${{ github.sha }}
63+
timeout: 120
6264
app-file: apk/release.apk
65+
android-api-level: 30
6366
workspace: .maestro
6467
include-tags: androidDesignSystemTest
6568

@@ -71,5 +74,5 @@ jobs:
7174
asana-workspace-id: ${{ secrets.GH_ASANA_WORKSPACE_ID }}
7275
asana-project-id: ${{ secrets.GH_ASANA_AOR_PROJECT_ID }}
7376
asana-section-id: ${{ secrets.GH_ASANA_INCOMING_ID }}
74-
asana-task-name: GH Workflow Failure - ADS Preview test
77+
asana-task-name: GH Workflow Failure - ADS Preview test (Robin)
7578
asana-task-description: The ADS Preview end to end workflow has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}

‎.github/workflows/build-ad-hoc.yml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: Build - Ad-hoc release
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
ref:
7+
description: 'Ref to build APK from (branch, tag, commit)'
8+
required: true
9+
10+
env:
11+
ASANA_PAT: ${{ secrets.GH_ASANA_SECRET }}
12+
GOOGLE_APPLICATION_CREDENTIALS: '#{ENV["HOME"]}/jenkins_static/com.duckduckgo.mobile.android/ddg-upload-firebase.json'
13+
GH_TOKEN: ${{ secrets.GT_DAXMOBILE }}
14+
15+
jobs:
16+
build-apk:
17+
name: Generate and upload universal APK to GH Action Run
18+
runs-on: ubuntu-latest
19+
20+
steps:
21+
- name: Checkout repository
22+
uses: actions/checkout@v4
23+
with:
24+
submodules: recursive
25+
token: ${{ secrets.GT_DAXMOBILE }}
26+
ref: ${{ github.event.inputs.ref }}
27+
28+
- name: Set up JDK 17
29+
uses: actions/setup-java@v4
30+
with:
31+
java-version: '17'
32+
distribution: 'adopt'
33+
34+
- name: Create folder
35+
if: always()
36+
run: mkdir apk
37+
38+
- name: Decode keys
39+
uses: davidSchuppa/base64Secret-toFile-action@v2
40+
with:
41+
secret: ${{ secrets.FAKE_RELEASE_PROPERTIES }}
42+
fileName: ddg_android_build.properties
43+
destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/
44+
45+
- name: Decode key file
46+
uses: davidSchuppa/base64Secret-toFile-action@v2
47+
with:
48+
secret: ${{ secrets.FAKE_RELEASE_KEY }}
49+
fileName: android
50+
destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/
51+
52+
- name: Setup Gradle
53+
uses: gradle/actions/setup-gradle@v3
54+
55+
- name: Assemble release APK
56+
run: ./gradlew assemblePlayRelease -Pforce-default-variant
57+
58+
- name: Move APK to new folder
59+
run: find . -name "*.apk" -exec mv '{}' apk/release.apk \;
60+
61+
- name: Upload debug apk
62+
if: always()
63+
uses: actions/upload-artifact@v4
64+
with:
65+
name: release
66+
path: apk/release.apk

‎.github/workflows/custom-tabs-nightly.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,12 @@ jobs:
5555
run: find . -name "*.apk" -exec mv '{}' apk/release.apk \;
5656

5757
- name: Custom Tabs Flows
58-
uses: mobile-dev-inc/action-maestro-cloud@v1.8.1
58+
uses: mobile-dev-inc/action-maestro-cloud@v1.9.7
5959
with:
60-
api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
61-
name: ${{ github.sha }}
60+
api-key: ${{ secrets.ROBIN_API_KEY }}
61+
project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
62+
name: customTabs_${{ github.sha }}
63+
timeout: 120
6264
app-file: apk/release.apk
6365
android-api-level: 30
6466
workspace: .maestro
@@ -72,6 +74,6 @@ jobs:
7274
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
7375
asana-project: ${{ vars.GH_ANDROID_APP_PROJECT_ID }}
7476
asana-section: ${{ vars.GH_ANDROID_APP_INCOMING_SECTION_ID }}
75-
asana-task-name: GH Workflow Failure - Custom Tabs Flows
77+
asana-task-name: GH Workflow Failure - Custom Tabs Flows (Robin)
7678
asana-task-description: The Custom Tabs nightly workflow has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
7779
action: 'create-asana-task'

‎.github/workflows/e2e-nightly-autofill.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,12 @@ jobs:
5555
run: find . -name "*.apk" -exec mv '{}' apk/release.apk \;
5656

5757
- name: Autofill Critical Path E2E Flows
58-
uses: mobile-dev-inc/action-maestro-cloud@v1.8.1
58+
uses: mobile-dev-inc/action-maestro-cloud@v1.9.7
5959
with:
60-
api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
61-
name: ${{ github.sha }}
60+
api-key: ${{ secrets.ROBIN_API_KEY }}
61+
project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
62+
name: autofill_${{ github.sha }}
63+
timeout: 120
6264
app-file: apk/release.apk
6365
android-api-level: 30
6466
workspace: .maestro
@@ -72,6 +74,6 @@ jobs:
7274
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
7375
asana-project: ${{ vars.GH_ANDROID_APP_PROJECT_ID }}
7476
asana-section: ${{ vars.GH_ANDROID_APP_INCOMING_SECTION_ID }}
75-
asana-task-name: GH Workflow Failure - Autofill Critical Path E2E Flows
77+
asana-task-name: GH Workflow Failure - Autofill Critical Path E2E Flows (Robin)
7678
asana-task-description: Autofill critical path tests have failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
7779
action: 'create-asana-task'

‎.github/workflows/end-to-end.yml‎

Lines changed: 0 additions & 119 deletions
This file was deleted.

‎.github/workflows/privacy-dashboard-end-to-end.yml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,25 @@ jobs:
5858
run: find . -name "*.apk" -exec mv '{}' apk/release.apk \;
5959

6060
- name: Ad click detection flows
61-
uses: mobile-dev-inc/action-maestro-cloud@v1.8.1
61+
uses: mobile-dev-inc/action-maestro-cloud@v1.9.7
6262
with:
63-
api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
64-
name: ${{ github.sha }}
63+
api-key: ${{ secrets.ROBIN_API_KEY }}
64+
project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
65+
name: privacyDashboard_adClickTest_${{ github.sha }}
66+
timeout: 120
6567
app-file: apk/release.apk
68+
android-api-level: 30
6669
workspace: .maestro
6770
include-tags: adClickTest
6871

6972
- name: Privacy Tests
7073
if: always()
71-
uses: mobile-dev-inc/action-maestro-cloud@v1.8.1
74+
uses: mobile-dev-inc/action-maestro-cloud@v1.9.7
7275
with:
73-
api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
74-
name: ${{ github.sha }}
76+
api-key: ${{ secrets.ROBIN_API_KEY }}
77+
project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
78+
name: privacyDashboard_privacyTest_${{ github.sha }}
79+
timeout: 120
7580
app-file: apk/release.apk
7681
workspace: .maestro
7782
include-tags: privacyTest

‎.github/workflows/release_create_tag.yml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
env:
1212
ASANA_PAT: ${{ secrets.GH_ASANA_SECRET }}
1313
GH_TOKEN: ${{ secrets.GT_DAXMOBILE }}
14+
emoji_info: ":information_source:" # ℹ️
1415

1516
concurrency:
1617
group: ${{ github.workflow }}-${{ github.ref }}
@@ -46,6 +47,16 @@ jobs:
4647
run: |
4748
bundle exec fastlane android tag_and_push_release_version app_version:${{ github.event.inputs.app-version }}
4849
50+
- name: Notify Mattermost
51+
id: send-mm-message
52+
uses: duckduckgo/[email protected]
53+
with:
54+
mattermost-token: ${{ secrets.MM_AUTH_TOKEN }}
55+
mattermost-team-id: ${{ secrets.MM_TEAM_ID }}
56+
mattermost-channel-name: ${{ vars.MM_RELEASE_NOTIFY_CHANNEL }}
57+
mattermost-message: ${{env.emoji_start}} Release ${{ github.event.inputs.app-version }}. Tag created.
58+
action: 'send-mattermost-message'
59+
4960
- name: Create Asana task when workflow failed
5061
if: ${{ failure() }}
5162
id: create-failure-task
@@ -56,4 +67,15 @@ jobs:
5667
asana-section: ${{ vars.GH_ANDROID_APP_INCOMING_SECTION_ID }}
5768
asana-task-name: GH Workflow Failure - Tag Android Release
5869
asana-task-description: Tag Android Release has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
59-
action: 'create-asana-task'
70+
action: 'create-asana-task'
71+
72+
- name: Notify Mattermost when workflow failed
73+
if: ${{ failure() }}
74+
id: send-mm-message-error
75+
uses: duckduckgo/[email protected]
76+
with:
77+
mattermost-token: ${{ secrets.MM_AUTH_TOKEN }}
78+
mattermost-team-id: ${{ secrets.MM_TEAM_ID }}
79+
mattermost-channel-name: ${{ vars.MM_RELEASE_NOTIFY_CHANNEL }}
80+
mattermost-message: ${{env.emoji_start}} Tag Android Release has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
81+
action: 'send-mattermost-message'

0 commit comments

Comments
 (0)