From 0f47d67922d81cc1f216542b856d2c022fec5385 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 16:10:41 +0300 Subject: [PATCH] fix: rollback --- .gitea/workflows/test.yml | 57 +++++++-------------------------------- 1 file changed, 10 insertions(+), 47 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index ad555613..59cf2638 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -9,17 +9,11 @@ env: jobs: build: - runs-on: [dev-office] + runs-on: [ dev-office ] steps: - uses: actions/checkout@v3 - - name: Cache JDK - uses: actions/cache@v3 - with: - path: ~/.cache/zulu - key: jdk-${{ runner.os }}-java-${{ env.java_version }} # Ключ для JDK - - name: Set up JDK uses: actions/setup-java@v3 with: @@ -27,49 +21,17 @@ jobs: java-version: ${{ env.java_version }} id: setup-jdk - - name: Cache cmdline-tools - uses: actions/cache@v3 - with: - path: $HOME/Android/Sdk/cmdline-tools - key: android-cmdline-tools-${{ runner.os }}-sdk - restore-keys: | - android-cmdline-tools-${{ runner.os }}-sdk - android-cmdline-tools-${{ runner.os }} - android-cmdline-tools - - - name: Cache Android SDK - uses: actions/cache@v3 - with: - path: $HOME/Android/Sdk - key: android-sdk-${{ runner.os }}-sdk - restore-keys: | - android-sdk-${{ runner.os }}-sdk - android-sdk-${{ runner.os }} - android-sdk - - - name: Cache Flutter SDK - uses: actions/cache@v3 - with: - path: ~/.pub-cache # Путь к кэшу Flutter SDK - key: flutter-${{ runner.os }}-${{ env.flutter_channel }}-${{ env.flutter_version }} - restore-keys: | - flutter-${{ runner.os }}-${{ env.flutter_channel }}- - flutter-${{ runner.os }}- - - name: Install Android SDK run: | - if [ ! -d "$HOME/Android/Sdk/cmdline-tools/latest" ]; then - 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 - mkdir -p $HOME/Android/Sdk/cmdline-tools/latest - mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/ - fi - + 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 + mkdir -p $HOME/Android/Sdk/cmdline-tools/latest + mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/ export ANDROID_SDK_ROOT=$HOME/Android/Sdk export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin - yes | sdkmanager --licenses 2>/dev/null || true + yes | sdkmanager --licenses 2>/dev/null || true - name: Set up Android environment variables run: | @@ -86,6 +48,7 @@ jobs: with: channel: ${{ env.flutter_channel }} flutter-version: ${{ env.flutter_version }} + cache: true - name: Fix dir permissions run: | @@ -119,4 +82,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: ${{ env.APK_NAME }} - path: ${{ env.APK_NAME }} \ No newline at end of file + path: ${{ env.APK_NAME }}