Skip to content

Commit

Permalink
Cache dependencies bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
Elite-Labs committed Mar 25, 2024
1 parent 2768799 commit 04a4494
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 21 deletions.
24 changes: 4 additions & 20 deletions .github/workflows/cache_dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,15 @@ jobs:

steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: '11.x'

- name: Flutter action
uses: subosito/flutter-action@v1
with:
flutter-version: '3.10.x'
channel: stable

- name: Install package dependencies
run: sudo apt-get install -y curl unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake clang

- name: Execute Build and Setup Commands
run: |
sudo mkdir -p /opt/android
sudo chown $USER /opt/android
cd /opt/android
git clone https://github.com/Elite-Labs/EliteWallet --branch main
cd EliteWallet/scripts/android/
./install_ndk.sh
source ./app_env.sh elitewallet
./app_config.sh
cd EliteWallet/
./scripts/build_deps.sh --skip_main_deps android
- name: Cache Externals
id: cache-externals
Expand All @@ -53,7 +39,5 @@ jobs:
- if: ${{ steps.cache-externals.outputs.cache-hit != 'true' }}
name: Generate Externals
run: |
cd /opt/android/EliteWallet/scripts/android/
source ./app_env.sh elitewallet
./build_all.sh
./copy_monero_deps.sh
cd /opt/android/EliteWallet/
./scripts/build_deps.sh android
6 changes: 5 additions & 1 deletion scripts/build_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fi

if [[ ! " $@ " =~ " --skip_other_deps " ]]; then
if [[ "$BUILD_PLATFORM" == "android" ]]; then
sudo apt-get install -y curl unzip automake build-essential file pkg-config git python2 libtool libtinfo5 cmake openjdk-8-jre-headless clang bison byacc gperf groff
sudo apt-get install -y curl unzip automake build-essential file pkg-config git python2 libtool libtinfo5 cmake openjdk-11-jre-headless clang bison byacc gperf groff
else
brew install autoconf cmake pkg-config cocoapods
fi
Expand All @@ -33,6 +33,10 @@ git config --global protocol.file.allow always

git submodule update --init --force

if [[ ! " $@ " =~ " --skip_main_deps " ]]; then
exit 0
fi

cd scripts/android

configure_and_build_deps () {
Expand Down

0 comments on commit 04a4494

Please sign in to comment.