diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index e9837822..094a029a 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -23,21 +23,21 @@ jobs: - name: Install Android SDK run: | - brew install --cask android-sdk - mkdir -p $HOME/Android/Sdk/cmdline-tools - cd $HOME/Android/Sdk/cmdline-tools - wget https://dl.google.com/android/repository/commandlinetools-mac-7583922_latest.zip -O commandlinetools.zip + apt-get update + apt-get install -y openjdk-11-jdk wget + wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip unzip commandlinetools.zip - mv cmdline-tools latest + mkdir -p $HOME/Android/Sdk + mv cmdline-tools $HOME/Android/Sdk/ export ANDROID_SDK_ROOT=$HOME/Android/Sdk - export PATH=$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/30.0.3 + export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/bin yes | sdkmanager --licenses sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3" - name: Set up Android environment variables run: | echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV - echo "PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/30.0.3:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin" >> $GITHUB_ENV + echo "PATH=$PATH:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV - uses: actions/cache@v2 diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index dd1c5a7a..78bc049d 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -23,21 +23,21 @@ jobs: - name: Install Android SDK run: | - brew install --cask android-sdk - mkdir -p $HOME/Android/Sdk/cmdline-tools - cd $HOME/Android/Sdk/cmdline-tools - wget https://dl.google.com/android/repository/commandlinetools-mac-7583922_latest.zip -O commandlinetools.zip + apt-get update + apt-get install -y openjdk-11-jdk wget + wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip unzip commandlinetools.zip - mv cmdline-tools latest + mkdir -p $HOME/Android/Sdk + mv cmdline-tools $HOME/Android/Sdk/ export ANDROID_SDK_ROOT=$HOME/Android/Sdk - export PATH=$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/30.0.3 + export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/bin yes | sdkmanager --licenses sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3" - name: Set up Android environment variables run: | echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV - echo "PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/30.0.3:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin" >> $GITHUB_ENV + echo "PATH=$PATH:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV - uses: actions/cache@v2