From 5ce0d6f86e64cb86913a04d905b9c1b6272067b7 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Mon, 13 May 2024 11:54:17 +0200 Subject: [PATCH] fix monero_c build issues --- .github/workflows/cache_dependencies.yml | 1 + .github/workflows/pr_test_build.yml | 7 +++++-- scripts/prepare_moneroc.sh | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cache_dependencies.yml b/.github/workflows/cache_dependencies.yml index bf0d0f7bc..4654ac033 100644 --- a/.github/workflows/cache_dependencies.yml +++ b/.github/workflows/cache_dependencies.yml @@ -46,6 +46,7 @@ jobs: /opt/android/cake_wallet/cw_monero/android/.cxx /opt/android/cake_wallet/cw_monero/ios/External /opt/android/cake_wallet/cw_shared_external/ios/External + /opt/android/cake_wallet/scripts/monero_c/release key: ${{ hashFiles('**/build_monero.sh', '**/build_haven.sh', '**/monero_api.cpp') }} - if: ${{ steps.cache-externals.outputs.cache-hit != 'true' }} diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml index 49fefe0ba..cd2b76c20 100644 --- a/.github/workflows/pr_test_build.yml +++ b/.github/workflows/pr_test_build.yml @@ -38,7 +38,10 @@ jobs: - uses: actions/setup-java@v1 with: java-version: "11.x" - + - name: Configure placeholder git details + run: | + git config --global user.email "CI@cakewallet.com" + git config --global user.name "Cake Github Actions" - name: Flutter action uses: subosito/flutter-action@v1 with: @@ -73,7 +76,7 @@ jobs: /opt/android/cake_wallet/cw_monero/ios/External /opt/android/cake_wallet/cw_shared_external/ios/External /opt/android/cake_wallet/scripts/monero_c/release - key: ${{ hashFiles('**/build_monero_all.sh', '**/build_haven.sh', '**/monero_api.cpp') }} + key: ${{ hashFiles('**/prepare_moneroc.sh' ,'**/build_monero_all.sh', '**/build_haven.sh', '**/monero_api.cpp') }} - if: ${{ steps.cache-externals.outputs.cache-hit != 'true' }} name: Generate Externals diff --git a/scripts/prepare_moneroc.sh b/scripts/prepare_moneroc.sh index 015cf76f3..b75282754 100755 --- a/scripts/prepare_moneroc.sh +++ b/scripts/prepare_moneroc.sh @@ -5,7 +5,6 @@ set -x -e cd "$(dirname "$0")" - if [[ ! -d "monero_c" ]]; then git clone https://github.com/mrcyjanek/monero_c --branch rewrite-wip