diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 4387f72d..bd6cf419 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -33,7 +33,7 @@ jobs: - name: Install utils for Android SDK run: | apt-get update - apt-get install -y openjdk-11-jdk wget jq clang cmake ninja-build libgtk-3-dev + apt-get install -y openjdk-11-jdk wget jq clang cmake ninja-build libgtk-3-dev - name: Install Android SDK if: steps.cache-sdk.outputs.cache-hit != 'true' @@ -47,17 +47,17 @@ jobs: yes | sdkmanager --licenses 2>/dev/null || true sdkmanager --list | egrep "platform-tools|build-tools|ndk" sdkmanager "platform-tools" - sdkmanager "platform-tools" "platforms;android-35" - sdkmanager "build-tools;35.0.0" - sdkmanager "ndk;28.0.12433566" - sdkmanager --install "cmake;3.31.1" + sdkmanager "platform-tools" "platforms;android-35" "platforms;android-34" "platforms;android-33" "platforms;android-31" + sdkmanager "build-tools;34.0.0" + sdkmanager "ndk;25.1.8937393" + sdkmanager --install "cmake;3.22.1" - name: Set up Android environment variables id: "android-env-setup" run: | echo "ANDROID_SDK_ROOT=${{ env.my_local_cache_dir }}Android/Sdk" >> $GITHUB_ENV echo "PATH=$PATH:${{ env.my_local_cache_dir }}Android/Sdk/cmdline-tools/latest/bin:${{ env.my_local_cache_dir }}Android/Sdk/platform-tools:${{ env.my_local_cache_dir }}Android/Sdk/build-tools/30.0.3:${{ env.my_local_cache_dir }}Android/Sdk/build-tools/34.0.0" >> $GITHUB_ENV - echo "ANDROID_HOME=${{ env.my_local_cache_dir }}Android/Sdk" >> $GITHUB_ENV + echo "ANDROID_HOME=${{ env.my_local_cache_dir }}Android/Sdk" >> $GITHUB_ENV - id: flutter-action uses: actions/flutter-action@v2 @@ -88,8 +88,7 @@ jobs: run: | git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }} flutter config --android-sdk="$ANDROID_HOME" - flutter config --jdk-dir ${{ env.my_local_cache_dir }}Java_Zulu_jdk/21.0.5-11/x64 - flutter doctor -v + flutter doctor -v - name: Get dependencies run: flutter pub get @@ -98,7 +97,7 @@ jobs: run: flutter analyze - name: Test - run: flutter test + run: flutter test - name: Build apk run: flutter build apk --release @@ -109,7 +108,7 @@ jobs: APK_NAME="eatvio_app_${TIMESTAMP}.apk" mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME echo "APK build finished $APK_NAME" - echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV + echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV - name: Upload APK artifact uses: actions/upload-artifact@v3