fix: install dep

novasamatech · Feb 19, 2025 · 8f9c5f6 · 8f9c5f6
1 parent d44b594
commit 8f9c5f6
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 21 deletions.
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
@@ -44,17 +44,17 @@ jobs:
           distribution: 'adopt'
           java-version: 17
 
-      - name: Debug Android SDK setup
+      - name: Setup Android SDK
         run: |
-          echo "Current working directory: $(pwd)"
-          echo "ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT:-not set}"
-          echo "Listing root directory structure:"
-          ls -la /
-          echo "Checking for Android SDK directories:"
-          ls -la /usr/local/lib/android || echo "No /usr/local/lib/android"
-          ls -la /opt/android-sdk || echo "No /opt/android-sdk"
-          echo "Environment variables:"
-          env | grep -i android
+          mkdir -p /opt/android-sdk
+          export ANDROID_SDK_ROOT=/opt/android-sdk
+          echo "ANDROID_SDK_ROOT=/opt/android-sdk" >> $GITHUB_ENV
+          wget https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip
+          unzip commandlinetools-linux-9477386_latest.zip -d $ANDROID_SDK_ROOT
+          mkdir -p $ANDROID_SDK_ROOT/cmdline-tools/latest
+          mv $ANDROID_SDK_ROOT/cmdline-tools/* $ANDROID_SDK_ROOT/cmdline-tools/latest/ || true
+          rm -rf $ANDROID_SDK_ROOT/cmdline-tools/latest/cmdline-tools
+          yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
 
       - name:           Install NDK
         run:            echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT}
@@ -112,17 +112,17 @@ jobs:
           java-version: 17
 
 
-      - name: Debug Android SDK setup
+      - name: Setup Android SDK
         run: |
-          echo "Current working directory: $(pwd)"
-          echo "ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT:-not set}"
-          echo "Listing root directory structure:"
-          ls -la /
-          echo "Checking for Android SDK directories:"
-          ls -la /usr/local/lib/android || echo "No /usr/local/lib/android"
-          ls -la /opt/android-sdk || echo "No /opt/android-sdk"
-          echo "Environment variables:"
-          env | grep -i android
+          mkdir -p /opt/android-sdk
+          export ANDROID_SDK_ROOT=/opt/android-sdk
+          echo "ANDROID_SDK_ROOT=/opt/android-sdk" >> $GITHUB_ENV
+          wget https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip
+          unzip commandlinetools-linux-9477386_latest.zip -d $ANDROID_SDK_ROOT
+          mkdir -p $ANDROID_SDK_ROOT/cmdline-tools/latest
+          mv $ANDROID_SDK_ROOT/cmdline-tools/* $ANDROID_SDK_ROOT/cmdline-tools/latest/ || true
+          rm -rf $ANDROID_SDK_ROOT/cmdline-tools/latest/cmdline-tools
+          yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
 
       - name:           Install NDK
         run:            echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT}

diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
@@ -39,6 +39,18 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: 17
+
+      - name: Setup Android SDK
+        run: |
+          mkdir -p /opt/android-sdk
+          export ANDROID_SDK_ROOT=/opt/android-sdk
+          echo "ANDROID_SDK_ROOT=/opt/android-sdk" >> $GITHUB_ENV
+          wget https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip
+          unzip commandlinetools-linux-9477386_latest.zip -d $ANDROID_SDK_ROOT
+          mkdir -p $ANDROID_SDK_ROOT/cmdline-tools/latest
+          mv $ANDROID_SDK_ROOT/cmdline-tools/* $ANDROID_SDK_ROOT/cmdline-tools/latest/ || true
+          rm -rf $ANDROID_SDK_ROOT/cmdline-tools/latest/cmdline-tools
+          yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
 
       - name:           Install NDK
         run:            echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT}
@@ -95,6 +107,18 @@ jobs:
           distribution: 'adopt'
           java-version: 17
 
+      - name: Setup Android SDK
+        run: |
+          mkdir -p /opt/android-sdk
+          export ANDROID_SDK_ROOT=/opt/android-sdk
+          echo "ANDROID_SDK_ROOT=/opt/android-sdk" >> $GITHUB_ENV
+          wget https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip
+          unzip commandlinetools-linux-9477386_latest.zip -d $ANDROID_SDK_ROOT
+          mkdir -p $ANDROID_SDK_ROOT/cmdline-tools/latest
+          mv $ANDROID_SDK_ROOT/cmdline-tools/* $ANDROID_SDK_ROOT/cmdline-tools/latest/ || true
+          rm -rf $ANDROID_SDK_ROOT/cmdline-tools/latest/cmdline-tools
+          yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
+
       - name:           Install NDK
         run:            echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT}
 

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -27,6 +27,11 @@ jobs:
           fetch-depth:        1
           submodules:         recursive
 
+      - name:                 Install dependencies
+        run:                  |
+          sudo apt-get update
+          sudo apt-get install -y libclang-dev
+
       # - name:                 Rust Cache
       #   uses:                 Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7
       #   with:

diff --git a/.github/workflows/rust-clippy.yml b/.github/workflows/rust-clippy.yml
@@ -27,7 +27,7 @@ jobs:
       - name:                 Install dependencies
         run:                  |
           sudo apt-get update
-          sudo apt-get install llvm-dev libclang-dev clang
+          sudo apt-get install -y llvm-dev libclang-dev clang
 
       - name:                 Install Rust stable toolchain
         uses:                 dtolnay/rust-toolchain@stable