diff --git a/.github/workflows/atomicdex-desktop-cd.yml b/.github/workflows/atomicdex-desktop-cd.yml index 24778dc32..0066556a3 100644 --- a/.github/workflows/atomicdex-desktop-cd.yml +++ b/.github/workflows/atomicdex-desktop-cd.yml @@ -319,8 +319,6 @@ jobs: - name: Install deps (MacOS/Debug) run: | - rm '/usr/local/bin/2to3-3.12' - rm '/usr/local/bin/idle3' brew update brew upgrade brew install autoconf \ diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 61e7bc499..0728505c9 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -204,7 +204,7 @@ jobs: - name: import code signing certificates (macos) if: runner.os == 'macOS' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository - uses: Apple-Actions/import-codesign-certs@v1 + uses: Apple-Actions/import-codesign-certs@v3 with: keychain: ${{ github.run_id }} keychain-password: ${{ github.run_id }} @@ -213,7 +213,7 @@ jobs: - name: import installer code signing certificates (macos) if: runner.os == 'macOS' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository - uses: apple-actions/import-codesign-certs@v1 + uses: apple-actions/import-codesign-certs@v3 with: keychain: ${{ github.run_id }} keychain-password: ${{ github.run_id }} @@ -232,7 +232,7 @@ jobs: echo $HOME/sdk ls $HOME/sdk export MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}" - export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.INSTALLER_MAC_SIGN_IDENTITY }}" + export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}" export APPLE_ATOMICDEX_PASSWORD="${{ secrets.APPLE_ATOMICDEX_PASSWORD }}" export APPLE_ID="${{ secrets.APPLE_ID }}" export ASC_PUBLIC_ID="${{ secrets.ASC_PUBLIC_ID }}" @@ -382,7 +382,7 @@ jobs: if: runner.os == 'macOS' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository run: | export MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}" - export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.INSTALLER_MAC_SIGN_IDENTITY }}" + export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}" export APPLE_ATOMICDEX_PASSWORD="${{ secrets.APPLE_ATOMICDEX_PASSWORD }}" export APPLE_ID="${{ secrets.APPLE_ID }}" export ASC_PUBLIC_ID="${{ secrets.ASC_PUBLIC_ID }}" diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index 67e569b9f..4fa728be8 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -15,8 +15,10 @@ brew install autoconf \ gnu-getopt brew unlink python@3.12 +brew unlink python@3.13 brew install llvm brew link --overwrite python@3.12 +brew link --overwrite python@3.13 pip3 install yq export CC=clang