Skip to content

Commit

Permalink
Merge branch 'release/5.213.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
CDRussell committed Aug 29, 2024
2 parents ae9b877 + 08e39b2 commit d3015ce
Show file tree
Hide file tree
Showing 1,031 changed files with 57,490 additions and 40,948 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/action-issue-opened.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
issues: write
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Render template
id: render_template
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/ads-end-to-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
Expand All @@ -44,10 +44,11 @@ jobs:
fileName: android
destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/

- name: Assemble release APK
uses: gradle/gradle-build-action@v2
with:
arguments: assembleInternalRelease -Pforce-default-variant
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3

- name: Assemble the project
run: ./gradlew assembleInternalRelease -Pforce-default-variant

- name: Move APK to new folder
if: always()
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/build-debug-apk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,34 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

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

- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v5
with:
go-version: '1.18.3'

- name: Build
uses: gradle/gradle-build-action@v2
with:
arguments: assembleInternalDebug -Pforce-default-variant
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3

- name: Assemble the project
run: ./gradlew assembleInternalDebug -Pforce-default-variant

- name: Obtain debug apk
if: always()
run: cp $(find . -regex '.*outputs/apk/.*internal-debug.apk') pr-ddg-debug.apk

- name: Upload debug apk
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pr-ddg-debug
path: pr-ddg-debug.apk
51 changes: 51 additions & 0 deletions .github/workflows/build-fdroid-apk.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Build F-Droid apk

on:
push:
branches:
- develop
paths-ignore:
- '**.md'
- '.github/**'
pull_request:
paths:
- 'subscriptions/subscriptions-api/**'
- 'subscriptions/subscriptions-dummy-impl/**'
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build_fdroid_apk:
name: Build F-Droid apk
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
submodules: recursive

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

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

- name: Assemble F-Droid release apk
run: ./gradlew assembleFdroidRelease

- name: Create Asana task when workflow failed on push to develop
if: ${{ failure() && github.ref == 'refs/heads/develop' && github.event_name == 'push' }}
uses: honeycombio/gha-create-asana-task@main
with:
asana-secret: ${{ secrets.GH_ASANA_SECRET }}
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 - Build F-Droid apk
asana-task-description: The build F-Droid apk workflow has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
58 changes: 30 additions & 28 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,49 +24,51 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

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

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

- name: Run Code Formatting Checks
uses: gradle/gradle-build-action@v2
with:
arguments: code_format_checks
run: ./gradlew code_format_checks

unit_tests:
name: Unit tests
runs-on: android-large-runner

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

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

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

- name: JVM tests
uses: gradle/gradle-build-action@v2
with:
arguments: jvm_tests
run: ./gradlew jvm_tests

- name: Bundle the JVM checks report
if: always()
run: find . -type d -name 'reports' | zip -@ -r unit-tests-report.zip

- name: Upload the JVM checks report
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: unit-tests-report
path: unit-tests-report.zip
Expand All @@ -77,33 +79,34 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

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

- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v5
with:
go-version: '1.18.3'

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

- name: Lint
uses: gradle/gradle-build-action@v2
with:
arguments: lint
run: ./gradlew lint

- name: Bundle the lint report
if: always()
run: find . -name lint-results\* | zip -@ -r lint-report.zip

- name: Upload the JVM lint report
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: lint-report
path: lint-report.zip
Expand All @@ -114,7 +117,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

Expand All @@ -124,13 +127,13 @@ jobs:
force: true

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

- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v5
with:
go-version: '1.18.3'

Expand All @@ -139,15 +142,14 @@ jobs:
FLANK: ${{ secrets.FLANK }}
run: echo $FLANK > flank.json

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

- name: Build
uses: gradle/gradle-build-action@v2
with:
arguments: androidTestsBuild
run: ./gradlew androidTestsBuild

- name: Run Android Tests
uses: gradle/gradle-build-action@v2
with:
arguments: runFlankAndroidTests
run: ./gradlew runFlankAndroidTests

- name: Bundle the Android CI tests report
if: always()
Expand All @@ -164,7 +166,7 @@ jobs:
- name: Upload the Android CI tests report
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: android-tests-report
path: android-tests-report.zip
11 changes: 6 additions & 5 deletions .github/workflows/custom-tabs-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
Expand All @@ -44,10 +44,11 @@ jobs:
fileName: android
destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/

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

- name: Assemble internal release APK
uses: gradle/gradle-build-action@v2
with:
arguments: assembleInternalRelease -Pforce-default-variant -x lint
run: ./gradlew assembleInternalRelease -Pforce-default-variant -x lint

- name: Move APK to new folder
if: always()
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

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

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

- name: Execute Gradle build
run: ./gradlew dokkaHtmlMultiModule
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/e2e-nightly-autofill.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
Expand All @@ -44,10 +44,11 @@ jobs:
fileName: android
destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/

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

- name: Assemble APK which does not require auth to use Autofill
uses: gradle/gradle-build-action@v2
with:
arguments: assemblePlayRelease -Pautofill-disable-auth-requirement -Pforce-default-variant -x lint
run: ./gradlew assemblePlayRelease -Pautofill-disable-auth-requirement -Pforce-default-variant -x lint

- name: Move APK to new folder
if: always()
Expand Down
Loading

0 comments on commit d3015ce

Please sign in to comment.