From 0f6b1c11b3fed5fedb4d4fe03880dc9c13586387 Mon Sep 17 00:00:00 2001 From: Theophile Sandoz Date: Tue, 14 Jan 2025 18:58:36 +0100 Subject: [PATCH] fix(lld): try to fix the mac build --- .github/workflows/build-and-test-pr.yml | 2 +- .github/workflows/build-desktop-reusable.yml | 2 +- tools/actions/composites/setup-build-desktop/action.yml | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml index 9c615c5467e3..04630a15782e 100644 --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@ -25,7 +25,7 @@ jobs: name: "Build Desktop" needs: determine-affected if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-desktop') && !github.event.pull_request.head.repo.fork }} - uses: LedgerHQ/ledger-live/.github/workflows/build-desktop-reusable.yml@develop + uses: LedgerHQ/ledger-live/.github/workflows/build-desktop-reusable.yml@poc/asar-integrity-check secrets: inherit test-desktop: diff --git a/.github/workflows/build-desktop-reusable.yml b/.github/workflows/build-desktop-reusable.yml index 8057033af4f9..b34a48df0491 100644 --- a/.github/workflows/build-desktop-reusable.yml +++ b/.github/workflows/build-desktop-reusable.yml @@ -67,7 +67,7 @@ jobs: - name: Build desktop id: build-desktop - uses: LedgerHQ/ledger-live/tools/actions/composites/setup-build-desktop@develop + uses: LedgerHQ/ledger-live/tools/actions/composites/setup-build-desktop@poc/asar-integrity-check with: os: ${{ matrix.config.name }} diff --git a/tools/actions/composites/setup-build-desktop/action.yml b/tools/actions/composites/setup-build-desktop/action.yml index 8a7c660f960f..a4bb1f8ad4f5 100644 --- a/tools/actions/composites/setup-build-desktop/action.yml +++ b/tools/actions/composites/setup-build-desktop/action.yml @@ -15,6 +15,11 @@ outputs: runs: using: "composite" steps: + - name: Install setuptools + # if: ${{ matrix.config.name == 'mac' }} + # if: ${{ inputs.os == 'mac' }} + run: python -m pip install setuptools + shell: bash - name: install dependencies env: LC_ALL: en_US.UTF-8