Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
live-github-bot[bot] committed Jun 18, 2024
2 parents 6f2bc1a + 209439b commit a27c42b
Show file tree
Hide file tree
Showing 2,346 changed files with 246,587 additions and 181,229 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ module.exports = {
],
},
],
"@typescript-eslint/no-explicit-any": "warn",
"@typescript-eslint/no-unused-vars": [
"error",
{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-desktop-external.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
python-version: "3.x"
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
bundler-cache: true
- name: Setup the toolchain
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-toolchain@develop
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-mobile-external.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ jobs:
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-toolchain@develop
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
env:
ImageOS: ubuntu20
- uses: actions/setup-java@v3
with:
distribution: "zulu" # See 'Supported distributions' for available options
java-version: "11"
java-version: "17"
- name: setup Android SDK
uses: android-actions/[email protected]
- name: install dependencies
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: ${{ steps.post-version.outputs.version }}-release
path: ${{ github.workspace }}/apps/ledger-live-mobile/android/app/build/outputs/apk/release
path: ${{ github.workspace }}/apps/ledger-live-mobile/android/app/build/outputs/apk/stagingRelease

build-mobile-app-ios:
runs-on: macos-latest
Expand All @@ -100,7 +100,7 @@ jobs:
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-toolchain@develop
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
- name: install dependencies
run: pnpm i --filter="live-mobile..." --filter="ledger-live" --no-frozen-lockfile --unsafe-perm

Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/build-mobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
path: ${{ github.workspace }}/apps/ledger-live-mobile/android/app/build/outputs/apk/stagingRelease

build-mobile-app-ios:
runs-on: macos-latest
runs-on: [m1, ARM64]
name: "Build Ledger Live Mobile (Mac OS X)"
env:
NODE_OPTIONS: "--max-old-space-size=7168"
Expand All @@ -102,23 +102,20 @@ jobs:
- name: Setup git user
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-git-user@develop
- name: Setup the toolchain
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-toolchain@develop
id: toolchain
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-caches@develop
id: caches
with:
accountId: ${{ secrets.AWS_ACCOUNT_ID_PROD }}
roleName: ${{ secrets.AWS_CACHE_ROLE_NAME }}
region: ${{ secrets.AWS_CACHE_REGION }}
skip-pod-cache: "false"
skip-turbo-cache: "false"
turbo-server-token: ${{ secrets.TURBOREPO_SERVER_TOKEN }}
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
- name: install dependencies
run: pnpm i --filter="live-mobile..." --filter="ledger-live" --no-frozen-lockfile --unsafe-perm
- name: bundle ios and android js
run: |
pnpm build:llm:deps --api="http://127.0.0.1:${{ steps.toolchain.outputs.port }}" --token="${{ secrets.TURBOREPO_SERVER_TOKEN }}" --team="foo"
pnpm build:llm:deps --api="http://127.0.0.1:${{ steps.caches.outputs.port }}" --token="${{ secrets.TURBOREPO_SERVER_TOKEN }}" --team="foo"
pnpm mobile bundle:ios:prod
pnpm mobile bundle:android:prod
pnpm mobile gen-metafile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/regen-pods.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
turbo-server-token: ${{ secrets.TURBOREPO_SERVER_TOKEN }}
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
- name: install dependencies
run: pnpm i --filter="live-mobile..." --filter="ledger-live" --no-frozen-lockfile --unsafe-perm
- name: regenerate pods
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-final-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-toolchain@develop
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
# Not needed with a .ruby-version file
# runs 'bundle install' and caches installed gems automatically
- uses: LedgerHQ/ledger-live/tools/actions/get-package-infos@develop
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-final.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-toolchain@develop
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
- name: Cache LLM pods
uses: actions/cache@v3
with:
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/release-prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ on:
ref:
description: the branch to prerelease from
required: true
recover:
description: Recover Beta release track
required: false
type: boolean
default: false

jobs:
prerelease:
Expand Down Expand Up @@ -137,7 +132,7 @@ jobs:
owner: "ledgerhq",
repo: "ledger-live-build",
ref: "main",
workflow_id: "${{ inputs.recover && 'pre-mobile-recover.yml' || 'pre-mobile.yml' }}",
workflow_id: "pre-mobile.yml",
inputs: {
ref: "${{ github.event_name == 'workflow_dispatch' && inputs.ref || github.ref_name }}",
}
Expand Down
34 changes: 11 additions & 23 deletions .github/workflows/test-mobile-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,25 +120,19 @@ jobs:
xcrun simctl delete ${{ steps.simulator.outputs.id }}
- name: Generate single file Allure report
if: ${{ !cancelled() || steps.detox.outcome == 'cancelled' }}
run: pnpm dlx allure-commandline generate apps/ledger-live-mobile/allure-results --single-file
run: pnpm dlx allure-commandline generate apps/ledger-live-mobile/artifacts --single-file
- name: Upload Allure single file report
uses: actions/upload-artifact@v4
if: ${{ !cancelled() || steps.detox.outcome == 'cancelled' }}
with:
name: 1-global-ios-report
name: ios-allure-report
path: allure-report/index.html
- name: Upload test artifacts
uses: actions/upload-artifact@v4
if: ${{ !cancelled() || steps.detox.outcome == 'cancelled' }}
with:
name: 2-test-ios-artifacts
name: "ios-test-artifacts"
path: apps/ledger-live-mobile/artifacts
- name: Upload Allure report
uses: actions/upload-artifact@v4
if: ${{ !cancelled() || steps.detox.outcome == 'cancelled' }}
with:
name: "allure-ios-reports"
path: apps/ledger-live-mobile/allure-results

allure-report-ios:
name: "Allure Reports Export on Server"
Expand All @@ -154,7 +148,7 @@ jobs:
platform: ios
login: ${{ vars.ALLURE_USERNAME }}
password: ${{ secrets.ALLURE_LEDGER_LIVE_PASSWORD }}
path: allure-ios-reports
path: ios-test-artifacts

detox-tests-android:
name: "Ledger Live Mobile - Android Detox Tests"
Expand Down Expand Up @@ -187,11 +181,11 @@ jobs:
roleName: ${{ secrets.AWS_CACHE_ROLE_NAME }}
region: ${{ secrets.AWS_CACHE_REGION }}
turbo-server-token: ${{ secrets.TURBOREPO_SERVER_TOKEN }}
- name: setup JDK 11
- name: setup JDK 17
uses: actions/setup-java@v3
with:
distribution: "zulu"
java-version: "11"
java-version: "17"
cache: "gradle"
- name: setup Android SDK
uses: android-actions/[email protected]
Expand Down Expand Up @@ -262,25 +256,19 @@ jobs:
DETOX_INSTALL_TIMEOUT: 120000
- name: Generate single file Allure report
if: ${{ !cancelled() || steps.detox.outcome == 'cancelled' }}
run: pnpm dlx allure-commandline generate apps/ledger-live-mobile/allure-results --single-file
run: pnpm dlx allure-commandline generate apps/ledger-live-mobile/artifacts --single-file
- name: Upload Allure single file report
uses: actions/upload-artifact@v4
if: ${{ !cancelled() || steps.detox.outcome == 'cancelled' }}
with:
name: 1-global-android-report
name: android-allure-report
path: allure-report/index.html
- name: Upload test artifacts
if: ${{ !cancelled() || steps.detox.outcome == 'cancelled' }}
uses: actions/upload-artifact@v4
with:
name: 2-test-android-artifacts
path: apps/ledger-live-mobile/artifacts/
- name: Upload Allure Report
uses: actions/upload-artifact@v4
if: ${{ !cancelled() || steps.detox.outcome == 'cancelled' }}
with:
name: "allure-android-reports"
path: apps/ledger-live-mobile/allure-results
name: "android-test-artifacts"
path: apps/ledger-live-mobile/artifacts/

allure-report-android:
name: "Allure Reports Export on Server"
Expand All @@ -297,7 +285,7 @@ jobs:
platform: android
login: ${{ vars.ALLURE_USERNAME }}
password: ${{ secrets.ALLURE_LEDGER_LIVE_PASSWORD }}
path: allure-android-reports
path: android-test-artifacts

report:
needs: [detox-tests-android, detox-tests-ios]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-mobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
turbo-server-token: ${{ secrets.TURBOREPO_SERVER_TOKEN }}
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
- name: Install dependencies
run: pnpm i --filter="live-mobile..." --filter="ledger-live" --no-frozen-lockfile --unsafe-perm
- name: Run linter
Expand Down
Loading

0 comments on commit a27c42b

Please sign in to comment.