Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch 'main' into ideal-nav-merge-conflicts #39

Closed
wants to merge 2 commits into from
Closed

Merge branch 'main' into ideal-nav-merge-conflicts #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c613fe4
Merge branch 'main' into ideal-nav-merge-conflicts
WojtekBoman Jan 25, 2024
05c25b0
Fix cachedReportsKey
WojtekBoman Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions .github/actions/composite/buildAndroidAPKDelta/action.yml
View file
Open in desktop

This file was deleted.

25 changes: 22 additions & 3 deletions ...ions/composite/buildAndroidAPK/action.yml → ...s/composite/buildAndroidE2EAPK/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,35 @@
name: Build an Android apk
name: Build an Android apk for e2e tests
description: Build an Android apk for an E2E test build and upload it as an artifact

inputs:
ARTIFACT_NAME:
description: The name of the workflow artifact where the APK should be uploaded
required: true
PACKAGE_SCRIPT_NAME:
description: The name of the npm script to run to build the APK
required: true
APP_OUTPUT_PATH:
description: The path to the built APK
required: true
MAPBOX_SDK_DOWNLOAD_TOKEN:
description: The token to use to download the MapBox SDK
required: true

runs:
using: composite
steps:
- name: Configure MapBox SDK
run: ./scripts/setup-mapbox-sdk.sh ${{ inputs.MAPBOX_SDK_DOWNLOAD_TOKEN }}
shell: bash

- uses: Expensify/App/.github/actions/composite/setupNode@main

- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: "oracle"
java-version: "17"

- uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
with:
ruby-version: "2.7"
Expand All @@ -19,11 +38,11 @@ runs:
- uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef

- name: Build APK
run: npm run android-build-e2e
run: npm run ${{ inputs.PACKAGE_SCRIPT_NAME }}
shell: bash

- name: Upload APK
uses: actions/upload-artifact@65d862660abb392b8c4a3d1195a2108db131dd05
with:
name: ${{ inputs.ARTIFACT_NAME }}
path: android/app/build/outputs/apk/e2e/release/app-e2e-release.apk
path: ${{ inputs.APP_OUTPUT_PATH }}
Loading
Loading