diff --git a/.buildkite/android.yml b/.buildkite/android.yml --- a/.buildkite/android.yml +++ b/.buildkite/android.yml @@ -5,9 +5,9 @@ - 'source /root/.cargo/env' - 'rustup target add aarch64-linux-android arm-linux-androideabi i686-linux-android x86_64-linux-android' - 'apt update && apt install -y autoconf libtool build-essential cmake git libgtest-dev libssl-dev zlib1g-dev' + - 'scripts/install_protobuf.sh' - 'yarn cleaninstall --frozen-lockfile --skip-optional' - 'cd native/android' - - 'scripts/install_protobuf.sh' - './gradlew clean && ./gradlew bundleRelease --no-daemon "-Dorg.gradle.jvmargs=-Xmx32g -XX:MaxPermSize=32g -XX:+HeapDumpOnOutOfMemoryError"' plugins: - docker#v3.13.0: diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml --- a/.github/workflows/android_ci.yml +++ b/.github/workflows/android_ci.yml @@ -27,7 +27,7 @@ run: rustup target add aarch64-linux-android arm-linux-androideabi i686-linux-android x86_64-linux-android - name: Install Protobuf compiler - working-directory: ./native/android/scripts + working-directory: ./scripts run: sudo ./install_protobuf.sh - name: Install Yarn diff --git a/.github/workflows/android_release.yml b/.github/workflows/android_release.yml --- a/.github/workflows/android_release.yml +++ b/.github/workflows/android_release.yml @@ -20,7 +20,7 @@ run: rustup target add aarch64-linux-android arm-linux-androideabi i686-linux-android x86_64-linux-android - name: Install Protobuf compiler - working-directory: ./native/android/scripts + working-directory: ./scripts run: sudo ./install_protobuf.sh - name: Install Yarn diff --git a/native/android/scripts/install_protobuf.sh b/scripts/install_protobuf.sh rename from native/android/scripts/install_protobuf.sh rename to scripts/install_protobuf.sh