From b9d74ffec0201ea481d04ad7e1591909ea68fdf4 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 07:39:44 +0000 Subject: [PATCH 01/35] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test.yml | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 0b639038..e3c55160 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -19,7 +19,14 @@ jobs: with: distribution: "zulu" java-version: ${{ env.java_version }} - cache: "gradle" + + - name: Cache Gradle dependencies + uses: actions/cache@v2 + with: + path: ~/.gradle/caches + key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + gradle-${{ runner.os }}- - name: Install Android SDK run: | @@ -31,28 +38,40 @@ jobs: 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: Cache Android SDK + uses: actions/cache@v2 + with: + path: | + $HOME/Android/Sdk + ~/.android + key: android-sdk-${{ runner.os }}-${{ hashFiles('**/build.gradle') }} + restore-keys: | + android-sdk-${{ runner.os }}- - name: Set up Android environment variables run: | echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV - echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV + echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV - name: Debug Environment Variables run: | echo "ANDROID_SDK_ROOT: $ANDROID_SDK_ROOT" echo "ANDROID_HOME: $ANDROID_HOME" - echo "PATH: $PATH" + echo "PATH: $PATH" - uses: actions/cache@v2 with: path: ${{ runner.tool_cache }}/flutter key: flutter-${{ env.flutter_version }}-${{ env.flutter_channel }} + restore-keys: | + flutter-${{ env.flutter_version }}- - name: Install jq run: | - apt-get install -y jq + apt-get install -y jq - id: flutter-action uses: actions/flutter-action@v2 @@ -69,14 +88,14 @@ jobs: echo VERSION=${{ steps.flutter-action.outputs.VERSION }} echo ARCHITECTURE=${{ steps.flutter-action.outputs.ARCHITECTURE }} echo PUB-CACHE-PATH=${{ steps.flutter-action.outputs.PUB-CACHE-PATH }} - echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }} + echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }} shell: bash - name: Fix dir permissions 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 doctor -v + flutter doctor -v - name: Get dependencies run: flutter pub get @@ -89,11 +108,11 @@ jobs: - name: Test run: | - flutter test + flutter test - name: Build apk run: | - flutter build apk + flutter build apk - name: Rename and move apk run: | @@ -101,7 +120,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 From 5409bb1ef105203f6077bf26e77bf7dcaf47c8e1 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 07:46:51 +0000 Subject: [PATCH 02/35] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test.yml | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index e3c55160..c879c02c 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -38,7 +38,7 @@ jobs: 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: Cache Android SDK uses: actions/cache@v2 @@ -54,24 +54,27 @@ jobs: run: | echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV - echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV + echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV - name: Debug Environment Variables run: | echo "ANDROID_SDK_ROOT: $ANDROID_SDK_ROOT" echo "ANDROID_HOME: $ANDROID_HOME" - echo "PATH: $PATH" + echo "PATH: $PATH" - - uses: actions/cache@v2 + - name: Cache Flutter dependencies + uses: actions/cache@v2 with: - path: ${{ runner.tool_cache }}/flutter + path: | + $HOME/.pub-cache + $HOME/.flutter key: flutter-${{ env.flutter_version }}-${{ env.flutter_channel }} restore-keys: | flutter-${{ env.flutter_version }}- - name: Install jq run: | - apt-get install -y jq + apt-get install -y jq - id: flutter-action uses: actions/flutter-action@v2 @@ -88,14 +91,14 @@ jobs: echo VERSION=${{ steps.flutter-action.outputs.VERSION }} echo ARCHITECTURE=${{ steps.flutter-action.outputs.ARCHITECTURE }} echo PUB-CACHE-PATH=${{ steps.flutter-action.outputs.PUB-CACHE-PATH }} - echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }} + echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }} shell: bash - name: Fix dir permissions 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 doctor -v + flutter doctor -v - name: Get dependencies run: flutter pub get @@ -103,16 +106,11 @@ jobs: - name: Native Analyze run: flutter analyze - #- name: Run Code Metrics - # run: flutter pub run dart_code_metrics:metrics lib --disable-sunset-warning --fatal-warnings --fatal-performance - - name: Test - run: | - flutter test + run: flutter test - name: Build apk - run: | - flutter build apk + run: flutter build apk - name: Rename and move apk run: | @@ -120,7 +118,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 From aa282e1b11063cf430f9994cc69950072b365fab Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 11:10:06 +0300 Subject: [PATCH 03/35] ix(version): upgrade --- lib/generated/intl/messages_all.dart | 2 +- lib/generated/intl/messages_en.dart | 54 ++++++++++++++-------------- lib/generated/l10n.dart | 4 +-- pubspec.yaml | 2 +- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lib/generated/intl/messages_all.dart b/lib/generated/intl/messages_all.dart index b6510a8a..203415cc 100644 --- a/lib/generated/intl/messages_all.dart +++ b/lib/generated/intl/messages_all.dart @@ -36,7 +36,7 @@ MessageLookupByLibrary? _findExact(String localeName) { Future initializeMessages(String localeName) { var availableLocale = Intl.verifiedLocale( localeName, (locale) => _deferredLibraries[locale] != null, - onFailure: (_) => null,); + onFailure: (_) => null); if (availableLocale == null) { return new SynchronousFuture(false); } diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 910355a7..ed377a7a 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -32,7 +32,7 @@ class MessageLookup extends MessageLookupByLibrary { "admin": MessageLookupByLibrary.simpleMessage("Админ"), "alko_type": MessageLookupByLibrary.simpleMessage("Алкоголь"), "alko_type_desc": MessageLookupByLibrary.simpleMessage( - "С некоторыми видами диет можно употреблять алкоголь в умеренных количествах. Рекомендуется совмещать вместе с низкокалорийными закусками.",), + "С некоторыми видами диет можно употреблять алкоголь в умеренных количествах. Рекомендуется совмещать вместе с низкокалорийными закусками."), "all": MessageLookupByLibrary.simpleMessage("Все"), "allergies_presence": MessageLookupByLibrary.simpleMessage("Наличие аллергии"), @@ -43,7 +43,7 @@ class MessageLookup extends MessageLookupByLibrary { "archived": MessageLookupByLibrary.simpleMessage("В архиве"), "authentificate": MessageLookupByLibrary.simpleMessage("Войти"), "average_pressure": MessageLookupByLibrary.simpleMessage( - "Средние показатели давления:",), + "Средние показатели давления:"), "bodymass_chart": MessageLookupByLibrary.simpleMessage("График ИМТ"), "calories": MessageLookupByLibrary.simpleMessage("Калории"), "carbohydrates": MessageLookupByLibrary.simpleMessage("Углеводы"), @@ -52,11 +52,11 @@ class MessageLookup extends MessageLookupByLibrary { "chest_circumference": MessageLookupByLibrary.simpleMessage("Обхват груди"), "choose_start_diet_date": MessageLookupByLibrary.simpleMessage( - "Выберите дату старты диеты. Она отобразиться у Вас в дневнике",), + "Выберите дату старты диеты. Она отобразиться у Вас в дневнике"), "circumference_empty": MessageLookupByLibrary.simpleMessage( - "Все замеры обязательны к заполнению",), + "Все замеры обязательны к заполнению"), "circumference_is_not_a_number": MessageLookupByLibrary.simpleMessage( - "Все замеры должны быть числами",), + "Все замеры должны быть числами"), "circumferences_chart": MessageLookupByLibrary.simpleMessage("График обхватов"), "city": MessageLookupByLibrary.simpleMessage("Город"), @@ -71,7 +71,7 @@ class MessageLookup extends MessageLookupByLibrary { "copy_link": MessageLookupByLibrary.simpleMessage("Скопировать ссылку"), "corb_type": MessageLookupByLibrary.simpleMessage("Мучное"), "corb_type_desc": MessageLookupByLibrary.simpleMessage( - "Если вы любите мучные продукты, но хотите придерживаться диеты, вам подходит диета с добавленим мучных блюд на основе цельнозерновых вариантов. В них больше сложных углеводов и клетчатки, что способствует длительному чувству сытости и поддерживает здоровье пищеварительной системы.",), + "Если вы любите мучные продукты, но хотите придерживаться диеты, вам подходит диета с добавленим мучных блюд на основе цельнозерновых вариантов. В них больше сложных углеводов и клетчатки, что способствует длительному чувству сытости и поддерживает здоровье пищеварительной системы."), "country": MessageLookupByLibrary.simpleMessage("Страна"), "date_of_birth": MessageLookupByLibrary.simpleMessage("Дата рождения"), "day": MessageLookupByLibrary.simpleMessage("День"), @@ -86,17 +86,17 @@ class MessageLookup extends MessageLookupByLibrary { "do_you_have_hypotension_tendency": MessageLookupByLibrary.simpleMessage("Есть ли у вас гипотония?"), "do_you_take_pills": MessageLookupByLibrary.simpleMessage( - "Принимаете ли вы лекарства или бады?",), + "Принимаете ли вы лекарства или бады?"), "down_pressure": MessageLookupByLibrary.simpleMessage("Нижние показатели давления:"), "draft": MessageLookupByLibrary.simpleMessage("Черновик"), "email": MessageLookupByLibrary.simpleMessage("Элетронная почта"), "email_empty": MessageLookupByLibrary.simpleMessage( - "Необходимо ввести адрес электронной почты",), + "Необходимо ввести адрес электронной почты"), "email_invalid": MessageLookupByLibrary.simpleMessage( - "Некорректный адрес электронной почты",), + "Некорректный адрес электронной почты"), "enter_additional_information": MessageLookupByLibrary.simpleMessage( - "Введите любую дополнительную информацию на своё усмотрение:",), + "Введите любую дополнительную информацию на своё усмотрение:"), "enter_information": MessageLookupByLibrary.simpleMessage("Введите информацию..."), "exit": MessageLookupByLibrary.simpleMessage("Выйти"), @@ -105,16 +105,16 @@ class MessageLookup extends MessageLookupByLibrary { "favorite_foods": MessageLookupByLibrary.simpleMessage("Любимые продукты"), "favorite_unfavorite_foods": MessageLookupByLibrary.simpleMessage( - "Ваши любимые/нелюбимые продукты питания?",), + "Ваши любимые/нелюбимые продукты питания?"), "female": MessageLookupByLibrary.simpleMessage("Женский"), "fill_in_information": MessageLookupByLibrary.simpleMessage("Заполните информацию:"), "finish": MessageLookupByLibrary.simpleMessage("Завершить"), "first_name": MessageLookupByLibrary.simpleMessage("Имя"), "first_name_empty": MessageLookupByLibrary.simpleMessage( - "Имя обязательно для заполнения",), + "Имя обязательно для заполнения"), "first_name_short": MessageLookupByLibrary.simpleMessage( - "В имени должен быть минимум 1 символ",), + "В имени должен быть минимум 1 символ"), "gr": MessageLookupByLibrary.simpleMessage("гр"), "grams": MessageLookupByLibrary.simpleMessage("гр"), "height_measurements": @@ -129,9 +129,9 @@ class MessageLookup extends MessageLookupByLibrary { "language": MessageLookupByLibrary.simpleMessage("Язык"), "last_name": MessageLookupByLibrary.simpleMessage("Фамилия"), "last_name_empty": MessageLookupByLibrary.simpleMessage( - "Фамилия обязательна для заполнения",), + "Фамилия обязательна для заполнения"), "last_name_short": MessageLookupByLibrary.simpleMessage( - "В фамилии должен быть минимум 6 символов",), + "В фамилии должен быть минимум 6 символов"), "lbl_english": MessageLookupByLibrary.simpleMessage("English"), "link_was_copied": MessageLookupByLibrary.simpleMessage("Ссылка успешно скопирована"), @@ -140,7 +140,7 @@ class MessageLookup extends MessageLookupByLibrary { "meal": MessageLookupByLibrary.simpleMessage("Приём пищи"), "meat_type": MessageLookupByLibrary.simpleMessage("С мясом"), "meat_type_desc": MessageLookupByLibrary.simpleMessage( - "Диета с мясом полезная и сбалансированная. Включает в себя нежирное мясо: курицу, индейку, кролика или говядину. В сочетании с овощами получаете все необходимые витамины и минералы. Не забывайте о порциях и старайтесь есть медленно, прислушиваясь к своему организму.",), + "Диета с мясом полезная и сбалансированная. Включает в себя нежирное мясо: курицу, индейку, кролика или говядину. В сочетании с овощами получаете все необходимые витамины и минералы. Не забывайте о порциях и старайтесь есть медленно, прислушиваясь к своему организму."), "milliliter": MessageLookupByLibrary.simpleMessage("мл"), "msg_network_err": MessageLookupByLibrary.simpleMessage("Сетевая ошибка!"), @@ -149,9 +149,9 @@ class MessageLookup extends MessageLookupByLibrary { "my_blog": MessageLookupByLibrary.simpleMessage("Мой блог"), "my_settings": MessageLookupByLibrary.simpleMessage("Мои настройки"), "name_empty": MessageLookupByLibrary.simpleMessage( - "Имя пользователя обязательно для заполнения",), + "Имя пользователя обязательно для заполнения"), "name_short": MessageLookupByLibrary.simpleMessage( - "В имени пользователя должно быть минимум 6 символов",), + "В имени пользователя должно быть минимум 6 символов"), "no": MessageLookupByLibrary.simpleMessage("Нет"), "no_account": MessageLookupByLibrary.simpleMessage("У меня нет аккаунта"), @@ -162,9 +162,9 @@ class MessageLookup extends MessageLookupByLibrary { "password_confirmation_mismatch": MessageLookupByLibrary.simpleMessage("Пароли не совпадают"), "password_empty": MessageLookupByLibrary.simpleMessage( - "Пароль обязателен для заполнения",), + "Пароль обязателен для заполнения"), "password_short": MessageLookupByLibrary.simpleMessage( - "В пароле должно быть минимум 6 символов",), + "В пароле должно быть минимум 6 символов"), "pcs": MessageLookupByLibrary.simpleMessage("шт"), "place_of_living": MessageLookupByLibrary.simpleMessage("Место проживания"), @@ -173,9 +173,9 @@ class MessageLookup extends MessageLookupByLibrary { "preferred_language": MessageLookupByLibrary.simpleMessage("Предпочитаемый язык общения"), "pressure_empty": MessageLookupByLibrary.simpleMessage( - "Все показатели давления обязательны к заполнению",), + "Все показатели давления обязательны к заполнению"), "pressure_is_not_a_number": MessageLookupByLibrary.simpleMessage( - "Все показатели давления должны быть числами",), + "Все показатели давления должны быть числами"), "profile": MessageLookupByLibrary.simpleMessage("Профиль"), "proteins": MessageLookupByLibrary.simpleMessage("Белки"), "save": MessageLookupByLibrary.simpleMessage("Сохранить"), @@ -184,11 +184,11 @@ class MessageLookup extends MessageLookupByLibrary { "skip": MessageLookupByLibrary.simpleMessage("Пропустить"), "startDiet": MessageLookupByLibrary.simpleMessage("Начать диету"), "tell_your_schedule": MessageLookupByLibrary.simpleMessage( - "Расскажите в свободной форме о том как просыпаетесь, когда едите, когда ложитесь спать:",), + "Расскажите в свободной форме о том как просыпаетесь, когда едите, когда ложитесь спать:"), "unfavorite_foods": MessageLookupByLibrary.simpleMessage("Нелюбимые продукты"), "up_pressure": MessageLookupByLibrary.simpleMessage( - "Верхние показатели давления:",), + "Верхние показатели давления:"), "user_authorization": MessageLookupByLibrary.simpleMessage("Аутентификация"), "user_registration": @@ -196,7 +196,7 @@ class MessageLookup extends MessageLookupByLibrary { "username": MessageLookupByLibrary.simpleMessage("Имя пользователя"), "vegan_type": MessageLookupByLibrary.simpleMessage("Вегетарианская"), "vegan_type_desc": MessageLookupByLibrary.simpleMessage( - "Диета основана на потреблении растительной пищи и отказе от продуктов животного происхождения. Такой тип питания может быть разнообразным и вкусным, а также полезным для здоровья.",), + "Диета основана на потреблении растительной пищи и отказе от продуктов животного происхождения. Такой тип питания может быть разнообразным и вкусным, а также полезным для здоровья."), "waist": MessageLookupByLibrary.simpleMessage("Талия"), "waist_circumference": MessageLookupByLibrary.simpleMessage("Обхват талии"), @@ -207,7 +207,7 @@ class MessageLookup extends MessageLookupByLibrary { "what_is_your_name": MessageLookupByLibrary.simpleMessage("Как вас зовут?"), "wrong_credentials": MessageLookupByLibrary.simpleMessage( - "Неверные данные пользователя",), + "Неверные данные пользователя"), "your_blood_pressure": MessageLookupByLibrary.simpleMessage("Ваше артериальное давление?"), "your_favorite_sports": @@ -215,6 +215,6 @@ class MessageLookup extends MessageLookupByLibrary { "your_gender": MessageLookupByLibrary.simpleMessage("Ваш пол?"), "your_height": MessageLookupByLibrary.simpleMessage("Ваш рост:"), "your_schedule": MessageLookupByLibrary.simpleMessage("Ваш режим дня?"), - "your_weight": MessageLookupByLibrary.simpleMessage("Ваш вес:"), + "your_weight": MessageLookupByLibrary.simpleMessage("Ваш вес:") }; } diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 9fd1162c..96121d43 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -19,7 +19,7 @@ class S { static S get current { assert(_current != null, - 'No instance of S was loaded. Try to initialize the S delegate before accessing S.current.',); + 'No instance of S was loaded. Try to initialize the S delegate before accessing S.current.'); return _current!; } @@ -42,7 +42,7 @@ class S { static S of(BuildContext context) { final instance = S.maybeOf(context); assert(instance != null, - 'No instance of S present in the widget tree. Did you add S.delegate in localizationsDelegates?',); + 'No instance of S present in the widget tree. Did you add S.delegate in localizationsDelegates?'); return instance!; } diff --git a/pubspec.yaml b/pubspec.yaml index 652f6273..7ea1a971 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: eatvio_app description: A new Flutter project. -version: 0.0.0+1 +version: 1.0.1+16 publish_to: "none" environment: From b3656cfc212701162b8be2933e55809ebec5b89b Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 11:34:56 +0300 Subject: [PATCH 04/35] fix(version): upgrade --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 7ea1a971..5b2c8596 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: eatvio_app description: A new Flutter project. -version: 1.0.1+16 +version: 1.0.2+17 publish_to: "none" environment: From b979969d3c1d7a23fbb84360f8f584a19d5482dc Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 12:42:23 +0300 Subject: [PATCH 05/35] fix: analyzer --- .../presentation/pages/profile_screen.dart | 2 +- lib/generated/intl/messages_all.dart | 2 +- lib/generated/intl/messages_en.dart | 54 +++++++++---------- lib/generated/l10n.dart | 4 +- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lib/features/profile/presentation/pages/profile_screen.dart b/lib/features/profile/presentation/pages/profile_screen.dart index 380d37c4..48ace714 100644 --- a/lib/features/profile/presentation/pages/profile_screen.dart +++ b/lib/features/profile/presentation/pages/profile_screen.dart @@ -124,7 +124,7 @@ class _ProfileScreenState extends State { if (widget.author == null) const SizedBox(height: 16), _activePlans(state), if (widget.author == null) const SizedBox(height: 16), - _newBlogPostButton(), + if (widget.author == null) _newBlogPostButton(), _blogPosts(state), ], ), diff --git a/lib/generated/intl/messages_all.dart b/lib/generated/intl/messages_all.dart index 203415cc..b6510a8a 100644 --- a/lib/generated/intl/messages_all.dart +++ b/lib/generated/intl/messages_all.dart @@ -36,7 +36,7 @@ MessageLookupByLibrary? _findExact(String localeName) { Future initializeMessages(String localeName) { var availableLocale = Intl.verifiedLocale( localeName, (locale) => _deferredLibraries[locale] != null, - onFailure: (_) => null); + onFailure: (_) => null,); if (availableLocale == null) { return new SynchronousFuture(false); } diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index ed377a7a..910355a7 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -32,7 +32,7 @@ class MessageLookup extends MessageLookupByLibrary { "admin": MessageLookupByLibrary.simpleMessage("Админ"), "alko_type": MessageLookupByLibrary.simpleMessage("Алкоголь"), "alko_type_desc": MessageLookupByLibrary.simpleMessage( - "С некоторыми видами диет можно употреблять алкоголь в умеренных количествах. Рекомендуется совмещать вместе с низкокалорийными закусками."), + "С некоторыми видами диет можно употреблять алкоголь в умеренных количествах. Рекомендуется совмещать вместе с низкокалорийными закусками.",), "all": MessageLookupByLibrary.simpleMessage("Все"), "allergies_presence": MessageLookupByLibrary.simpleMessage("Наличие аллергии"), @@ -43,7 +43,7 @@ class MessageLookup extends MessageLookupByLibrary { "archived": MessageLookupByLibrary.simpleMessage("В архиве"), "authentificate": MessageLookupByLibrary.simpleMessage("Войти"), "average_pressure": MessageLookupByLibrary.simpleMessage( - "Средние показатели давления:"), + "Средние показатели давления:",), "bodymass_chart": MessageLookupByLibrary.simpleMessage("График ИМТ"), "calories": MessageLookupByLibrary.simpleMessage("Калории"), "carbohydrates": MessageLookupByLibrary.simpleMessage("Углеводы"), @@ -52,11 +52,11 @@ class MessageLookup extends MessageLookupByLibrary { "chest_circumference": MessageLookupByLibrary.simpleMessage("Обхват груди"), "choose_start_diet_date": MessageLookupByLibrary.simpleMessage( - "Выберите дату старты диеты. Она отобразиться у Вас в дневнике"), + "Выберите дату старты диеты. Она отобразиться у Вас в дневнике",), "circumference_empty": MessageLookupByLibrary.simpleMessage( - "Все замеры обязательны к заполнению"), + "Все замеры обязательны к заполнению",), "circumference_is_not_a_number": MessageLookupByLibrary.simpleMessage( - "Все замеры должны быть числами"), + "Все замеры должны быть числами",), "circumferences_chart": MessageLookupByLibrary.simpleMessage("График обхватов"), "city": MessageLookupByLibrary.simpleMessage("Город"), @@ -71,7 +71,7 @@ class MessageLookup extends MessageLookupByLibrary { "copy_link": MessageLookupByLibrary.simpleMessage("Скопировать ссылку"), "corb_type": MessageLookupByLibrary.simpleMessage("Мучное"), "corb_type_desc": MessageLookupByLibrary.simpleMessage( - "Если вы любите мучные продукты, но хотите придерживаться диеты, вам подходит диета с добавленим мучных блюд на основе цельнозерновых вариантов. В них больше сложных углеводов и клетчатки, что способствует длительному чувству сытости и поддерживает здоровье пищеварительной системы."), + "Если вы любите мучные продукты, но хотите придерживаться диеты, вам подходит диета с добавленим мучных блюд на основе цельнозерновых вариантов. В них больше сложных углеводов и клетчатки, что способствует длительному чувству сытости и поддерживает здоровье пищеварительной системы.",), "country": MessageLookupByLibrary.simpleMessage("Страна"), "date_of_birth": MessageLookupByLibrary.simpleMessage("Дата рождения"), "day": MessageLookupByLibrary.simpleMessage("День"), @@ -86,17 +86,17 @@ class MessageLookup extends MessageLookupByLibrary { "do_you_have_hypotension_tendency": MessageLookupByLibrary.simpleMessage("Есть ли у вас гипотония?"), "do_you_take_pills": MessageLookupByLibrary.simpleMessage( - "Принимаете ли вы лекарства или бады?"), + "Принимаете ли вы лекарства или бады?",), "down_pressure": MessageLookupByLibrary.simpleMessage("Нижние показатели давления:"), "draft": MessageLookupByLibrary.simpleMessage("Черновик"), "email": MessageLookupByLibrary.simpleMessage("Элетронная почта"), "email_empty": MessageLookupByLibrary.simpleMessage( - "Необходимо ввести адрес электронной почты"), + "Необходимо ввести адрес электронной почты",), "email_invalid": MessageLookupByLibrary.simpleMessage( - "Некорректный адрес электронной почты"), + "Некорректный адрес электронной почты",), "enter_additional_information": MessageLookupByLibrary.simpleMessage( - "Введите любую дополнительную информацию на своё усмотрение:"), + "Введите любую дополнительную информацию на своё усмотрение:",), "enter_information": MessageLookupByLibrary.simpleMessage("Введите информацию..."), "exit": MessageLookupByLibrary.simpleMessage("Выйти"), @@ -105,16 +105,16 @@ class MessageLookup extends MessageLookupByLibrary { "favorite_foods": MessageLookupByLibrary.simpleMessage("Любимые продукты"), "favorite_unfavorite_foods": MessageLookupByLibrary.simpleMessage( - "Ваши любимые/нелюбимые продукты питания?"), + "Ваши любимые/нелюбимые продукты питания?",), "female": MessageLookupByLibrary.simpleMessage("Женский"), "fill_in_information": MessageLookupByLibrary.simpleMessage("Заполните информацию:"), "finish": MessageLookupByLibrary.simpleMessage("Завершить"), "first_name": MessageLookupByLibrary.simpleMessage("Имя"), "first_name_empty": MessageLookupByLibrary.simpleMessage( - "Имя обязательно для заполнения"), + "Имя обязательно для заполнения",), "first_name_short": MessageLookupByLibrary.simpleMessage( - "В имени должен быть минимум 1 символ"), + "В имени должен быть минимум 1 символ",), "gr": MessageLookupByLibrary.simpleMessage("гр"), "grams": MessageLookupByLibrary.simpleMessage("гр"), "height_measurements": @@ -129,9 +129,9 @@ class MessageLookup extends MessageLookupByLibrary { "language": MessageLookupByLibrary.simpleMessage("Язык"), "last_name": MessageLookupByLibrary.simpleMessage("Фамилия"), "last_name_empty": MessageLookupByLibrary.simpleMessage( - "Фамилия обязательна для заполнения"), + "Фамилия обязательна для заполнения",), "last_name_short": MessageLookupByLibrary.simpleMessage( - "В фамилии должен быть минимум 6 символов"), + "В фамилии должен быть минимум 6 символов",), "lbl_english": MessageLookupByLibrary.simpleMessage("English"), "link_was_copied": MessageLookupByLibrary.simpleMessage("Ссылка успешно скопирована"), @@ -140,7 +140,7 @@ class MessageLookup extends MessageLookupByLibrary { "meal": MessageLookupByLibrary.simpleMessage("Приём пищи"), "meat_type": MessageLookupByLibrary.simpleMessage("С мясом"), "meat_type_desc": MessageLookupByLibrary.simpleMessage( - "Диета с мясом полезная и сбалансированная. Включает в себя нежирное мясо: курицу, индейку, кролика или говядину. В сочетании с овощами получаете все необходимые витамины и минералы. Не забывайте о порциях и старайтесь есть медленно, прислушиваясь к своему организму."), + "Диета с мясом полезная и сбалансированная. Включает в себя нежирное мясо: курицу, индейку, кролика или говядину. В сочетании с овощами получаете все необходимые витамины и минералы. Не забывайте о порциях и старайтесь есть медленно, прислушиваясь к своему организму.",), "milliliter": MessageLookupByLibrary.simpleMessage("мл"), "msg_network_err": MessageLookupByLibrary.simpleMessage("Сетевая ошибка!"), @@ -149,9 +149,9 @@ class MessageLookup extends MessageLookupByLibrary { "my_blog": MessageLookupByLibrary.simpleMessage("Мой блог"), "my_settings": MessageLookupByLibrary.simpleMessage("Мои настройки"), "name_empty": MessageLookupByLibrary.simpleMessage( - "Имя пользователя обязательно для заполнения"), + "Имя пользователя обязательно для заполнения",), "name_short": MessageLookupByLibrary.simpleMessage( - "В имени пользователя должно быть минимум 6 символов"), + "В имени пользователя должно быть минимум 6 символов",), "no": MessageLookupByLibrary.simpleMessage("Нет"), "no_account": MessageLookupByLibrary.simpleMessage("У меня нет аккаунта"), @@ -162,9 +162,9 @@ class MessageLookup extends MessageLookupByLibrary { "password_confirmation_mismatch": MessageLookupByLibrary.simpleMessage("Пароли не совпадают"), "password_empty": MessageLookupByLibrary.simpleMessage( - "Пароль обязателен для заполнения"), + "Пароль обязателен для заполнения",), "password_short": MessageLookupByLibrary.simpleMessage( - "В пароле должно быть минимум 6 символов"), + "В пароле должно быть минимум 6 символов",), "pcs": MessageLookupByLibrary.simpleMessage("шт"), "place_of_living": MessageLookupByLibrary.simpleMessage("Место проживания"), @@ -173,9 +173,9 @@ class MessageLookup extends MessageLookupByLibrary { "preferred_language": MessageLookupByLibrary.simpleMessage("Предпочитаемый язык общения"), "pressure_empty": MessageLookupByLibrary.simpleMessage( - "Все показатели давления обязательны к заполнению"), + "Все показатели давления обязательны к заполнению",), "pressure_is_not_a_number": MessageLookupByLibrary.simpleMessage( - "Все показатели давления должны быть числами"), + "Все показатели давления должны быть числами",), "profile": MessageLookupByLibrary.simpleMessage("Профиль"), "proteins": MessageLookupByLibrary.simpleMessage("Белки"), "save": MessageLookupByLibrary.simpleMessage("Сохранить"), @@ -184,11 +184,11 @@ class MessageLookup extends MessageLookupByLibrary { "skip": MessageLookupByLibrary.simpleMessage("Пропустить"), "startDiet": MessageLookupByLibrary.simpleMessage("Начать диету"), "tell_your_schedule": MessageLookupByLibrary.simpleMessage( - "Расскажите в свободной форме о том как просыпаетесь, когда едите, когда ложитесь спать:"), + "Расскажите в свободной форме о том как просыпаетесь, когда едите, когда ложитесь спать:",), "unfavorite_foods": MessageLookupByLibrary.simpleMessage("Нелюбимые продукты"), "up_pressure": MessageLookupByLibrary.simpleMessage( - "Верхние показатели давления:"), + "Верхние показатели давления:",), "user_authorization": MessageLookupByLibrary.simpleMessage("Аутентификация"), "user_registration": @@ -196,7 +196,7 @@ class MessageLookup extends MessageLookupByLibrary { "username": MessageLookupByLibrary.simpleMessage("Имя пользователя"), "vegan_type": MessageLookupByLibrary.simpleMessage("Вегетарианская"), "vegan_type_desc": MessageLookupByLibrary.simpleMessage( - "Диета основана на потреблении растительной пищи и отказе от продуктов животного происхождения. Такой тип питания может быть разнообразным и вкусным, а также полезным для здоровья."), + "Диета основана на потреблении растительной пищи и отказе от продуктов животного происхождения. Такой тип питания может быть разнообразным и вкусным, а также полезным для здоровья.",), "waist": MessageLookupByLibrary.simpleMessage("Талия"), "waist_circumference": MessageLookupByLibrary.simpleMessage("Обхват талии"), @@ -207,7 +207,7 @@ class MessageLookup extends MessageLookupByLibrary { "what_is_your_name": MessageLookupByLibrary.simpleMessage("Как вас зовут?"), "wrong_credentials": MessageLookupByLibrary.simpleMessage( - "Неверные данные пользователя"), + "Неверные данные пользователя",), "your_blood_pressure": MessageLookupByLibrary.simpleMessage("Ваше артериальное давление?"), "your_favorite_sports": @@ -215,6 +215,6 @@ class MessageLookup extends MessageLookupByLibrary { "your_gender": MessageLookupByLibrary.simpleMessage("Ваш пол?"), "your_height": MessageLookupByLibrary.simpleMessage("Ваш рост:"), "your_schedule": MessageLookupByLibrary.simpleMessage("Ваш режим дня?"), - "your_weight": MessageLookupByLibrary.simpleMessage("Ваш вес:") + "your_weight": MessageLookupByLibrary.simpleMessage("Ваш вес:"), }; } diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 96121d43..9fd1162c 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -19,7 +19,7 @@ class S { static S get current { assert(_current != null, - 'No instance of S was loaded. Try to initialize the S delegate before accessing S.current.'); + 'No instance of S was loaded. Try to initialize the S delegate before accessing S.current.',); return _current!; } @@ -42,7 +42,7 @@ class S { static S of(BuildContext context) { final instance = S.maybeOf(context); assert(instance != null, - 'No instance of S present in the widget tree. Did you add S.delegate in localizationsDelegates?'); + 'No instance of S present in the widget tree. Did you add S.delegate in localizationsDelegates?',); return instance!; } From 4752eede0b6e2b38b8a85dfa1922196bff2e6495 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 09:47:18 +0000 Subject: [PATCH 06/35] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test.yml | 74 +++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index c879c02c..7a15aa16 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -6,6 +6,7 @@ env: flutter_version: "3.24.4" java_version: "21.x" flutter_channel: "stable" + sdk_cache_key: "android-sdk-${{ runner.os }}-${{ hashFiles('**/android/**/*') }}" # Уникальный ключ для кэширования Android SDK jobs: build: @@ -19,37 +20,31 @@ jobs: with: distribution: "zulu" java-version: ${{ env.java_version }} - - - name: Cache Gradle dependencies - uses: actions/cache@v2 - with: - path: ~/.gradle/caches - key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - gradle-${{ runner.os }}- - - - name: Install Android SDK - run: | - 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 + cache: "gradle" + # Кэширование Android SDK - name: Cache Android SDK - uses: actions/cache@v2 + uses: actions/cache@v3 with: - path: | - $HOME/Android/Sdk - ~/.android - key: android-sdk-${{ runner.os }}-${{ hashFiles('**/build.gradle') }} + path: $HOME/Android/Sdk + key: ${{ env.sdk_cache_key }} restore-keys: | android-sdk-${{ runner.os }}- + - name: Install Android SDK (only if cache is missed) + run: | + if [ ! -d "$HOME/Android/Sdk" ]; 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/ + export ANDROID_SDK_ROOT=$HOME/Android/Sdk + export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin + yes | sdkmanager --licenses 2>/dev/null || true + fi + - name: Set up Android environment variables run: | echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV @@ -62,15 +57,12 @@ jobs: echo "ANDROID_HOME: $ANDROID_HOME" echo "PATH: $PATH" - - name: Cache Flutter dependencies - uses: actions/cache@v2 + # Кэширование Flutter SDK + - name: Cache Flutter SDK + uses: actions/cache@v3 with: - path: | - $HOME/.pub-cache - $HOME/.flutter + path: ${{ runner.tool_cache }}/flutter key: flutter-${{ env.flutter_version }}-${{ env.flutter_channel }} - restore-keys: | - flutter-${{ env.flutter_version }}- - name: Install jq run: | @@ -83,6 +75,13 @@ jobs: flutter-version: ${{ env.flutter_version }} cache: true + # Кэширование Flutter зависимостей (pub cache) + - name: Cache Flutter dependencies + uses: actions/cache@v3 + with: + path: ~/.pub-cache + key: flutter-deps-${{ env.flutter_version }}-${{ env.flutter_channel }} + - name: Show cache keys run: | echo CACHE-PATH=${{ steps.flutter-action.outputs.CACHE-PATH }} @@ -91,7 +90,7 @@ jobs: echo VERSION=${{ steps.flutter-action.outputs.VERSION }} echo ARCHITECTURE=${{ steps.flutter-action.outputs.ARCHITECTURE }} echo PUB-CACHE-PATH=${{ steps.flutter-action.outputs.PUB-CACHE-PATH }} - echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }} + echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }} shell: bash - name: Fix dir permissions @@ -106,11 +105,16 @@ jobs: - name: Native Analyze run: flutter analyze + #- name: Run Code Metrics + # run: flutter pub run dart_code_metrics:metrics lib --disable-sunset-warning --fatal-warnings --fatal-performance + - name: Test - run: flutter test + run: | + flutter test - name: Build apk - run: flutter build apk + run: | + flutter build apk - name: Rename and move apk run: | From ba1426d5ae5d92453f7ad182f8ea4ae127ef1781 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 10:00:14 +0000 Subject: [PATCH 07/35] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 7a15aa16..359787d7 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -10,7 +10,7 @@ env: jobs: build: - runs-on: ubuntu-latest + runs-on: [shalom] steps: - uses: actions/checkout@v3 From b4422058ca7ac520b395d9e10dd31abafede0d3b Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 10:03:18 +0000 Subject: [PATCH 08/35] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 359787d7..72ba865a 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -10,7 +10,7 @@ env: jobs: build: - runs-on: [shalom] + runs-on: [dev-office] steps: - uses: actions/checkout@v3 From 1c8f9f871f16bac78e38eed6c8203bcff6f20d30 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 10:14:00 +0000 Subject: [PATCH 09/35] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 72ba865a..7b9d4ca0 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -6,7 +6,8 @@ env: flutter_version: "3.24.4" java_version: "21.x" flutter_channel: "stable" - sdk_cache_key: "android-sdk-${{ runner.os }}-${{ hashFiles('**/android/**/*') }}" # Уникальный ключ для кэширования Android SDK + sdk_cache_key: "android-sdk-${{ runner.os }}-${{ hashFiles('**/android/**/*') }}" + jdk_cache_key: "jdk-${{ env.java_version }}-${{ runner.os }}" jobs: build: @@ -20,9 +21,16 @@ jobs: with: distribution: "zulu" java-version: ${{ env.java_version }} - cache: "gradle" + id: setup-jdk + + - name: Cache JDK + uses: actions/cache@v3 + with: + path: ~/.m2/repository + key: ${{ env.jdk_cache_key }} + restore-keys: | + jdk-${{ env.java_version }}- - # Кэширование Android SDK - name: Cache Android SDK uses: actions/cache@v3 with: @@ -57,7 +65,6 @@ jobs: echo "ANDROID_HOME: $ANDROID_HOME" echo "PATH: $PATH" - # Кэширование Flutter SDK - name: Cache Flutter SDK uses: actions/cache@v3 with: @@ -75,7 +82,6 @@ jobs: flutter-version: ${{ env.flutter_version }} cache: true - # Кэширование Flutter зависимостей (pub cache) - name: Cache Flutter dependencies uses: actions/cache@v3 with: @@ -90,7 +96,7 @@ jobs: echo VERSION=${{ steps.flutter-action.outputs.VERSION }} echo ARCHITECTURE=${{ steps.flutter-action.outputs.ARCHITECTURE }} echo PUB-CACHE-PATH=${{ steps.flutter-action.outputs.PUB-CACHE-PATH }} - echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }} + echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }} shell: bash - name: Fix dir permissions @@ -105,9 +111,6 @@ jobs: - name: Native Analyze run: flutter analyze - #- name: Run Code Metrics - # run: flutter pub run dart_code_metrics:metrics lib --disable-sunset-warning --fatal-warnings --fatal-performance - - name: Test run: | flutter test From 6fffed470696949143f79b6de55ae8723827e367 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 10:25:52 +0000 Subject: [PATCH 10/35] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 7b9d4ca0..ce10dfc3 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -26,7 +26,7 @@ jobs: - name: Cache JDK uses: actions/cache@v3 with: - path: ~/.m2/repository + path: /opt key: ${{ env.jdk_cache_key }} restore-keys: | jdk-${{ env.java_version }}- From d40c49d32b4a4665716b3ccb79f5d61ab7eca3b9 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 10:31:58 +0000 Subject: [PATCH 11/35] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test.yml | 45 +-------------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index ce10dfc3..beb27313 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -6,8 +6,6 @@ env: flutter_version: "3.24.4" java_version: "21.x" flutter_channel: "stable" - sdk_cache_key: "android-sdk-${{ runner.os }}-${{ hashFiles('**/android/**/*') }}" - jdk_cache_key: "jdk-${{ env.java_version }}-${{ runner.os }}" jobs: build: @@ -23,25 +21,8 @@ jobs: java-version: ${{ env.java_version }} id: setup-jdk - - name: Cache JDK - uses: actions/cache@v3 - with: - path: /opt - key: ${{ env.jdk_cache_key }} - restore-keys: | - jdk-${{ env.java_version }}- - - - name: Cache Android SDK - uses: actions/cache@v3 - with: - path: $HOME/Android/Sdk - key: ${{ env.sdk_cache_key }} - restore-keys: | - android-sdk-${{ runner.os }}- - - - name: Install Android SDK (only if cache is missed) + - name: Install Android SDK run: | - if [ ! -d "$HOME/Android/Sdk" ]; 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 @@ -51,7 +32,6 @@ jobs: export ANDROID_SDK_ROOT=$HOME/Android/Sdk export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin yes | sdkmanager --licenses 2>/dev/null || true - fi - name: Set up Android environment variables run: | @@ -65,12 +45,6 @@ jobs: echo "ANDROID_HOME: $ANDROID_HOME" echo "PATH: $PATH" - - name: Cache Flutter SDK - uses: actions/cache@v3 - with: - path: ${{ runner.tool_cache }}/flutter - key: flutter-${{ env.flutter_version }}-${{ env.flutter_channel }} - - name: Install jq run: | apt-get install -y jq @@ -82,23 +56,6 @@ jobs: flutter-version: ${{ env.flutter_version }} cache: true - - name: Cache Flutter dependencies - uses: actions/cache@v3 - with: - path: ~/.pub-cache - key: flutter-deps-${{ env.flutter_version }}-${{ env.flutter_channel }} - - - name: Show cache keys - run: | - echo CACHE-PATH=${{ steps.flutter-action.outputs.CACHE-PATH }} - echo CACHE-KEY=${{ steps.flutter-action.outputs.CACHE-KEY }} - echo CHANNEL=${{ steps.flutter-action.outputs.CHANNEL }} - echo VERSION=${{ steps.flutter-action.outputs.VERSION }} - echo ARCHITECTURE=${{ steps.flutter-action.outputs.ARCHITECTURE }} - echo PUB-CACHE-PATH=${{ steps.flutter-action.outputs.PUB-CACHE-PATH }} - echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }} - shell: bash - - name: Fix dir permissions run: | git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }} From beec890fe10a91127700ffc325e262b3ee864a53 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 14:25:03 +0300 Subject: [PATCH 12/35] fix: jq remove --- .gitea/workflows/test.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index beb27313..dd78efe9 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -39,16 +39,6 @@ jobs: echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV - - name: Debug Environment Variables - run: | - echo "ANDROID_SDK_ROOT: $ANDROID_SDK_ROOT" - echo "ANDROID_HOME: $ANDROID_HOME" - echo "PATH: $PATH" - - - name: Install jq - run: | - apt-get install -y jq - - id: flutter-action uses: actions/flutter-action@v2 with: From 0cf9110247cec18345bd4b77f3e9a076054d37ee Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 14:30:55 +0300 Subject: [PATCH 13/35] fix: jq revert --- .gitea/workflows/test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index dd78efe9..d5c5797f 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -39,6 +39,11 @@ jobs: echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV + + - name: Install jq + run: | + apt-get install -y jq + - id: flutter-action uses: actions/flutter-action@v2 with: From 4a8ff3085d2608fcf1045b281bbe52922f1f4c6c Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:05:34 +0300 Subject: [PATCH 14/35] fix: diary + cache --- .gitea/workflows/test.yml | 52 ++++++++++++------- .../diary/presentation/bloc/diary_cubit.dart | 2 +- .../diary/repositories/diary_repository.dart | 9 ++-- .../diary/services/diary_service.dart | 3 +- .../diary/services/diary_service.g.dart | 13 +++-- 5 files changed, 46 insertions(+), 33 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index d5c5797f..81cc2a94 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -3,35 +3,53 @@ name: Eatvio App Android Test on: [ pull_request ] env: - flutter_version: "3.24.4" + flutter_version: "3.24.5" java_version: "21.x" flutter_channel: "stable" jobs: build: - runs-on: [dev-office] + runs-on: [ dev-office ] + env: + key: "cache-v1" steps: - uses: actions/checkout@v3 + - name: Setup cache environment + id: extcache + uses: https://github.com/shivammathur/cache-extensions@v1 + with: + key: ${{ env.key }} + - name: Set up JDK uses: actions/setup-java@v3 with: distribution: "zulu" java-version: ${{ env.java_version }} - id: setup-jdk + + - name: Manage Android SDK cache + uses: actions/cache@v3 + with: + path: | + $HOME/Android/Sdk/cmdline-tools/latest/ + $HOME/Android/Sdk + $HOME/Android/Sdk/cmdline-tools/latest/bin + + key: ${{ steps.extcache.outputs.key }} - name: Install Android SDK run: | - 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 + 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 + - name: Set up Android environment variables run: | @@ -39,10 +57,8 @@ jobs: echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV - - name: Install jq - run: | - apt-get install -y jq + run: apt-get install -y jq - id: flutter-action uses: actions/flutter-action@v2 @@ -64,12 +80,10 @@ jobs: run: flutter analyze - name: Test - run: | - flutter test + run: flutter test - name: Build apk - run: | - flutter build apk + run: flutter build apk - name: Rename and move apk run: | diff --git a/lib/features/diary/presentation/bloc/diary_cubit.dart b/lib/features/diary/presentation/bloc/diary_cubit.dart index 74df5385..0c243ac4 100644 --- a/lib/features/diary/presentation/bloc/diary_cubit.dart +++ b/lib/features/diary/presentation/bloc/diary_cubit.dart @@ -25,7 +25,7 @@ class DiaryCubit extends Cubit { emit( DiaryState.loaded( diary: await diaryRepository.getDiaryByDate(date), - nutrition: await getNutrition(await diaryRepository.getDiaryIndexByDate(date)), + nutrition: await getNutrition((await diaryRepository.getDiaryByDate(date)).id), currentSelectedSatietyRating: currentSelectedSatietyRating, ), ); diff --git a/lib/features/diary/repositories/diary_repository.dart b/lib/features/diary/repositories/diary_repository.dart index 42f352f1..3db06d6f 100644 --- a/lib/features/diary/repositories/diary_repository.dart +++ b/lib/features/diary/repositories/diary_repository.dart @@ -11,14 +11,11 @@ class DiaryRepository { }); Future getDiaryByDate(String date) async { - return (await diaryService.getDiaryDay( - index: await getDiaryIndexByDate(date), - )) - .diary; + return (await getDiaryIndexByDate(date)).last; } - Future getDiaryIndexByDate(String date) async { - return (await diaryService.getDiaryIndexByDate(date: date)).id; + Future> getDiaryIndexByDate(String date) async { + return (await diaryService.getDiaryIndexByDate(date: date)); } Future getNutritionData(int index) async { diff --git a/lib/features/diary/services/diary_service.dart b/lib/features/diary/services/diary_service.dart index 833f9604..d4edd406 100644 --- a/lib/features/diary/services/diary_service.dart +++ b/lib/features/diary/services/diary_service.dart @@ -1,7 +1,6 @@ import 'dart:io'; import 'package:dio/dio.dart'; import 'package:eatvio_app/features/diary/models/diary_day_model.dart'; -import 'package:eatvio_app/features/diary/models/diary_index_model.dart'; import 'package:eatvio_app/features/diary/models/nutrition_model.dart'; import 'package:retrofit/retrofit.dart'; @@ -12,7 +11,7 @@ abstract class DiaryService { factory DiaryService(Dio dio, {String baseUrl}) = _DiaryService; @GET('/api/diary/index/{date}') - Future getDiaryIndexByDate({ + Future> getDiaryIndexByDate({ @Path('date') required String date, // yyyy-mm-dd }); diff --git a/lib/features/diary/services/diary_service.g.dart b/lib/features/diary/services/diary_service.g.dart index 03fa20ed..816c7fb5 100644 --- a/lib/features/diary/services/diary_service.g.dart +++ b/lib/features/diary/services/diary_service.g.dart @@ -22,12 +22,13 @@ class _DiaryService implements DiaryService { final ParseErrorLogger? errorLogger; @override - Future getDiaryIndexByDate({required String date}) async { + Future> getDiaryIndexByDate( + {required String date}) async { final _extra = {}; final queryParameters = {}; final _headers = {}; const Map? _data = null; - final _options = _setStreamType(Options( + final _options = _setStreamType>(Options( method: 'GET', headers: _headers, extra: _extra, @@ -43,10 +44,12 @@ class _DiaryService implements DiaryService { _dio.options.baseUrl, baseUrl, ))); - final _result = await _dio.fetch>(_options); - late DiaryIndexModel _value; + final _result = await _dio.fetch>(_options); + late List _value; try { - _value = DiaryIndexModel.fromJson(_result.data!); + _value = _result.data! + .map((dynamic i) => DiaryDayModel.fromJson(i as Map)) + .toList(); } on Object catch (e, s) { errorLogger?.logError(e, s, _options); rethrow; From 7b842c22d4a8dc48a065f6e17fb36344d2e77ca6 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:08:26 +0300 Subject: [PATCH 15/35] fix: cache --- .gitea/workflows/test.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 81cc2a94..cfc2d2a1 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -14,7 +14,17 @@ jobs: key: "cache-v1" steps: - - uses: actions/checkout@v3 + - uses: "actions/checkout@v3" + + - name: Set proxy server + run: | + cat </etc/apt/apt.conf.d/proxy.conf + Acquire::http::Proxy "socks5h://ohyi7eew5ieP:buKakoh1mequ@10.55.5.202:19843/"; + EOF + + - name: Update system + run: | + apt -y update - name: Setup cache environment id: extcache From 61318fee6a8a9dda67933f1a929f98fe60a5cdbd Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:09:02 +0300 Subject: [PATCH 16/35] fix: cache 2 --- .gitea/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index cfc2d2a1..97ad8944 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -23,8 +23,7 @@ jobs: EOF - name: Update system - run: | - apt -y update + run: apt-get update - name: Setup cache environment id: extcache From 4d72eb2c395634c080ba4d4ec8400104dda3a963 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:09:39 +0300 Subject: [PATCH 17/35] fix: cache 3 --- .gitea/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 97ad8944..9682e8d3 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -6,12 +6,11 @@ env: flutter_version: "3.24.5" java_version: "21.x" flutter_channel: "stable" + key: "cache-v1" jobs: build: runs-on: [ dev-office ] - env: - key: "cache-v1" steps: - uses: "actions/checkout@v3" From d1476c685b5cec1408b1b4875fa60b48f8417ad7 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:10:27 +0300 Subject: [PATCH 18/35] fix: cache 4 --- .gitea/workflows/test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 9682e8d3..a0816321 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -2,16 +2,16 @@ name: Eatvio App Android Test on: [ pull_request ] -env: - flutter_version: "3.24.5" - java_version: "21.x" - flutter_channel: "stable" - key: "cache-v1" - jobs: build: runs-on: [ dev-office ] + env: + flutter_version: "3.24.5" + java_version: "21.x" + flutter_channel: "stable" + key: "cache-v1" + steps: - uses: "actions/checkout@v3" From 07054b2ea4e14003d172242912ef91f37643d02d Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:10:51 +0300 Subject: [PATCH 19/35] fix: cache 5 --- .gitea/workflows/test.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index a0816321..a83cafb9 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -15,12 +15,6 @@ jobs: steps: - uses: "actions/checkout@v3" - - name: Set proxy server - run: | - cat </etc/apt/apt.conf.d/proxy.conf - Acquire::http::Proxy "socks5h://ohyi7eew5ieP:buKakoh1mequ@10.55.5.202:19843/"; - EOF - - name: Update system run: apt-get update From 48c3bc99161497cd9baa521cb5d7eb3f786949ed Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:12:10 +0300 Subject: [PATCH 20/35] fix: cache 6 --- .gitea/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index a83cafb9..8016d4aa 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -22,6 +22,7 @@ jobs: id: extcache uses: https://github.com/shivammathur/cache-extensions@v1 with: + extensions: ${{ env.extensions }} key: ${{ env.key }} - name: Set up JDK From a37b72212db54f70cf07b9f5924cff5e09cbfe90 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:12:59 +0300 Subject: [PATCH 21/35] fix: cache 7 --- .gitea/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 8016d4aa..86a2902d 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -7,6 +7,7 @@ jobs: runs-on: [ dev-office ] env: + extensions: gd flutter_version: "3.24.5" java_version: "21.x" flutter_channel: "stable" From 3a3b3e8fc67bbfade3f52402cd58d63f2bb79460 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:24:49 +0300 Subject: [PATCH 22/35] fix: cache 8 --- .gitea/workflows/test.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 86a2902d..ca81939c 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -36,9 +36,10 @@ jobs: uses: actions/cache@v3 with: path: | - $HOME/Android/Sdk/cmdline-tools/latest/ - $HOME/Android/Sdk - $HOME/Android/Sdk/cmdline-tools/latest/bin + /root/Android/Sdk/cmdline-tools/latest/ + /root/Android/Sdk + /root/Android/Sdk/cmdline-tools/latest/bin + /root/Android/Sdk/ key: ${{ steps.extcache.outputs.key }} From 08cd0a89c02f6843b9a30ce4335db6a8641d9260 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:33:24 +0300 Subject: [PATCH 23/35] fix: cache 9 --- .gitea/workflows/test.yml | 60 +++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 34 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index ca81939c..45a2d5af 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -1,30 +1,29 @@ name: Eatvio App Android Test -on: [ pull_request ] +on: [pull_request] jobs: build: - runs-on: [ dev-office ] + runs-on: [dev-office] env: extensions: gd flutter_version: "3.24.5" java_version: "21.x" flutter_channel: "stable" - key: "cache-v1" steps: - - uses: "actions/checkout@v3" + - name: Checkout code + uses: actions/checkout@v3 - name: Update system run: apt-get update - - name: Setup cache environment - id: extcache - uses: https://github.com/shivammathur/cache-extensions@v1 + - name: Cache JDK + uses: actions/cache@v3 with: - extensions: ${{ env.extensions }} - key: ${{ env.key }} + path: ~/.sdkman/candidates/java + key: jdk-${{ env.java_version }} - name: Set up JDK uses: actions/setup-java@v3 @@ -32,38 +31,32 @@ jobs: distribution: "zulu" java-version: ${{ env.java_version }} - - name: Manage Android SDK cache + - name: Cache Android SDK uses: actions/cache@v3 with: path: | - /root/Android/Sdk/cmdline-tools/latest/ - /root/Android/Sdk - /root/Android/Sdk/cmdline-tools/latest/bin - /root/Android/Sdk/ - - key: ${{ steps.extcache.outputs.key }} + $HOME/Android/Sdk + key: android-sdk-${{ runner.os }}-${{ hashFiles('**/build.gradle') }} - name: Install Android SDK run: | - 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/ + wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip + unzip commandlinetools.zip -d $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 | $HOME/Android/Sdk/cmdline-tools/latest/bin/sdkmanager --licenses || true - name: Set up Android environment variables run: | echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV - echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV + echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools" >> $GITHUB_ENV echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV - - name: Install jq - run: apt-get install -y jq + - name: Cache Flutter + uses: actions/cache@v3 + with: + path: ~/.flutter + key: flutter-${{ env.flutter_channel }}-${{ env.flutter_version }} - id: flutter-action uses: actions/flutter-action@v2 @@ -72,30 +65,29 @@ jobs: flutter-version: ${{ env.flutter_version }} cache: true - - name: Fix dir permissions + - name: Fix directory permissions and run Flutter doctor 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 doctor -v - name: Get dependencies run: flutter pub get - - name: Native Analyze + - name: Analyze code run: flutter analyze - - name: Test + - name: Run tests run: flutter test - - name: Build apk + - name: Build APK run: flutter build apk - - name: Rename and move apk + - name: Rename and move APK run: | TIMESTAMP=$(date +'%Y-%m-%d-%H-%M') 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 build finished: $APK_NAME" echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV - name: Upload APK artifact From 85853edc2f65221b9bd756a0291ca3fe18cc23ee Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:35:04 +0300 Subject: [PATCH 24/35] fix: cache 10 --- .gitea/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 45a2d5af..6d3335e9 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -19,6 +19,9 @@ jobs: - name: Update system run: apt-get update + - name: Install jq + run: apt-get install -y jq + - name: Cache JDK uses: actions/cache@v3 with: From a3ce0b08e04d651a066c00ed8023a653045ef4c3 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:37:25 +0300 Subject: [PATCH 25/35] fix: cache 11 --- .gitea/workflows/test.yml | 84 +++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 39 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 6d3335e9..d4f6f724 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -1,100 +1,106 @@ name: Eatvio App Android Test -on: [pull_request] +on: [ pull_request ] jobs: build: - runs-on: [dev-office] + runs-on: [ dev-office ] env: extensions: gd flutter_version: "3.24.5" java_version: "21.x" flutter_channel: "stable" + key: "cache-v1" + ANDROID_HOME: /root/Android/Sdk + SDK_CACHE_DIR: /root/Android/Sdk/ steps: - - name: Checkout code - uses: actions/checkout@v3 + - uses: actions/checkout@v3 - name: Update system run: apt-get update - - name: Install jq - run: apt-get install -y jq - - - name: Cache JDK - uses: actions/cache@v3 + - name: Setup cache environment + id: extcache + uses: https://github.com/shivammathur/cache-extensions@v1 with: - path: ~/.sdkman/candidates/java - key: jdk-${{ env.java_version }} + extensions: ${{ env.extensions }} + key: ${{ env.key }} + - name: Set up JDK uses: actions/setup-java@v3 with: - distribution: "zulu" + distribution: zulu java-version: ${{ env.java_version }} - name: Cache Android SDK uses: actions/cache@v3 with: - path: | - $HOME/Android/Sdk - key: android-sdk-${{ runner.os }}-${{ hashFiles('**/build.gradle') }} + path: ${{ env.SDK_CACHE_DIR }} + key: ${{ steps.extcache.outputs.key }}-android-sdk-${{ env.java_version }}-${{ runner.os }} + restore-keys: | + ${{ steps.extcache.outputs.key }}-android-sdk-* - - name: Install Android SDK + - name: Install Android SDK Command Line Tools run: | - mkdir -p $HOME/Android/Sdk/cmdline-tools/latest - wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip - unzip commandlinetools.zip -d $HOME/Android/Sdk/cmdline-tools/latest/ - export ANDROID_SDK_ROOT=$HOME/Android/Sdk - yes | $HOME/Android/Sdk/cmdline-tools/latest/bin/sdkmanager --licenses || true + apt-get update + apt-get install -y wget openjdk-11-jdk + wget -qO - https://dl.google.com/android/repository/commandlinetools-linux-latest.zip | \ + unzip -d "$HOME/Android/Sdk/cmdline-tools" + export ANDROID_HOME="${ANDROID_HOME}" + export PATH="$PATH:${ANDROID_HOME}/cmdline-tools/latest/bin" + sdkmanager --licenses - name: Set up Android environment variables run: | - echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV - echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools" >> $GITHUB_ENV - echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV + echo "$ANDROID_HOME" >> $GITHUB_ENV + echo "PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/30.0.3" >> $GITHUB_ENV # Corrected path - - name: Cache Flutter - uses: actions/cache@v3 - with: - path: ~/.flutter - key: flutter-${{ env.flutter_channel }}-${{ env.flutter_version }} + - name: Install jq + run: apt-get install -y jq - - id: flutter-action + - name: Set up Flutter uses: actions/flutter-action@v2 with: channel: ${{ env.flutter_channel }} flutter-version: ${{ env.flutter_version }} cache: true + architecture: ${{ runner.os }}-x64 - - name: Fix directory permissions and run Flutter doctor + + - name: Fix dir permissions (Avoids potential issues) run: | + #This is no longer needed if flutter-action@v2 uses appropriate caching + #Remove this step or add specific checks flutter config --android-sdk="$ANDROID_HOME" flutter doctor -v + - name: Get dependencies run: flutter pub get - - name: Analyze code + - name: Native Analyze run: flutter analyze - - name: Run tests + - name: Test run: flutter test - - name: Build APK - run: flutter build apk + - name: Build apk + run: flutter build apk --split-per-abi - - name: Rename and move APK + - name: Rename and move apk run: | TIMESTAMP=$(date +'%Y-%m-%d-%H-%M') APK_NAME="eatvio_app_${TIMESTAMP}.apk" - mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME - echo "APK build finished: $APK_NAME" + mv build/app/outputs/flutter-apk/app-release.apk "$APK_NAME" + echo "APK build finished $APK_NAME" echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV + - name: Upload APK artifact uses: actions/upload-artifact@v3 with: name: ${{ env.APK_NAME }} - path: ${{ env.APK_NAME }} + path: ${{ env.APK_NAME }} \ No newline at end of file From 2a7df1a35c4914afa9ed1a5fed352eb3be935ee4 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:39:41 +0300 Subject: [PATCH 26/35] fix: revert --- .gitea/workflows/test.yml | 87 +++++++++++++++------------------------ 1 file changed, 33 insertions(+), 54 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index d4f6f724..c7c530b8 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -2,81 +2,59 @@ name: Eatvio App Android Test on: [ pull_request ] +env: + flutter_version: "3.24.5" + java_version: "21.x" + flutter_channel: "stable" + jobs: build: - runs-on: [ dev-office ] - - env: - extensions: gd - flutter_version: "3.24.5" - java_version: "21.x" - flutter_channel: "stable" - key: "cache-v1" - ANDROID_HOME: /root/Android/Sdk - SDK_CACHE_DIR: /root/Android/Sdk/ + runs-on: [dev-office] steps: - uses: actions/checkout@v3 - - name: Update system - run: apt-get update - - - name: Setup cache environment - id: extcache - uses: https://github.com/shivammathur/cache-extensions@v1 - with: - extensions: ${{ env.extensions }} - key: ${{ env.key }} - - - name: Set up JDK uses: actions/setup-java@v3 with: - distribution: zulu + distribution: "zulu" java-version: ${{ env.java_version }} + id: setup-jdk - - name: Cache Android SDK - uses: actions/cache@v3 - with: - path: ${{ env.SDK_CACHE_DIR }} - key: ${{ steps.extcache.outputs.key }}-android-sdk-${{ env.java_version }}-${{ runner.os }} - restore-keys: | - ${{ steps.extcache.outputs.key }}-android-sdk-* - - - name: Install Android SDK Command Line Tools + - name: Install Android SDK run: | apt-get update - apt-get install -y wget openjdk-11-jdk - wget -qO - https://dl.google.com/android/repository/commandlinetools-linux-latest.zip | \ - unzip -d "$HOME/Android/Sdk/cmdline-tools" - export ANDROID_HOME="${ANDROID_HOME}" - export PATH="$PATH:${ANDROID_HOME}/cmdline-tools/latest/bin" - sdkmanager --licenses + 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 - name: Set up Android environment variables run: | - echo "$ANDROID_HOME" >> $GITHUB_ENV - echo "PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/30.0.3" >> $GITHUB_ENV # Corrected path + echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV + echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV + echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV - name: Install jq - run: apt-get install -y jq + run: | + apt-get install -y jq - - name: Set up Flutter + - id: flutter-action uses: actions/flutter-action@v2 with: channel: ${{ env.flutter_channel }} flutter-version: ${{ env.flutter_version }} cache: true - architecture: ${{ runner.os }}-x64 - - - name: Fix dir permissions (Avoids potential issues) + - name: Fix dir permissions run: | - #This is no longer needed if flutter-action@v2 uses appropriate caching - #Remove this step or add specific checks + 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 doctor -v - + flutter doctor -v - name: Get dependencies run: flutter pub get @@ -85,22 +63,23 @@ jobs: run: flutter analyze - name: Test - run: flutter test + run: | + flutter test - name: Build apk - run: flutter build apk --split-per-abi + run: | + flutter build apk - name: Rename and move apk run: | TIMESTAMP=$(date +'%Y-%m-%d-%H-%M') APK_NAME="eatvio_app_${TIMESTAMP}.apk" - mv build/app/outputs/flutter-apk/app-release.apk "$APK_NAME" + 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 with: name: ${{ env.APK_NAME }} - path: ${{ env.APK_NAME }} \ No newline at end of file + path: ${{ env.APK_NAME }} From ad34497019cc418f76bdb808e80e2f2d3665246d Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:41:06 +0300 Subject: [PATCH 27/35] fix: try --- .gitea/workflows/test.yml | 88 +++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 27 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index c7c530b8..93e76b48 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -6,55 +6,91 @@ env: flutter_version: "3.24.5" java_version: "21.x" flutter_channel: "stable" + ANDROID_SDK_ROOT: /root/Android/Sdk # Define this consistently + ANDROID_HOME: ${{ env.ANDROID_SDK_ROOT }} # Link ANDROID_HOME to ANDROID_SDK_ROOT + CACHE_KEY: ${{ runner.os }}-jdk-${{ env.java_version }}-flutter-${{ env.flutter_version }} jobs: build: - runs-on: [dev-office] + runs-on: [ dev-office ] steps: - uses: actions/checkout@v3 + - name: Cache JDK + uses: actions/cache@v3 + with: + path: ${{ env.JDK_HOME }} # You'll need to define JDK_HOME in a subsequent step + key: ${{ env.CACHE_KEY }}-jdk + restore-keys: | + ${{ env.CACHE_KEY }}-jdk- + - name: Set up JDK uses: actions/setup-java@v3 with: distribution: "zulu" java-version: ${{ env.java_version }} - id: setup-jdk + id: setup-jdk + # Set the JDK_HOME after the JDK installation. + # This is necessary for caching. + run: | + echo "JDK_HOME=$(echo "${{ steps.setup-jdk.outputs.java-home }}")" >> $GITHUB_ENV - - name: Install Android SDK + + - name: Cache Android SDK, NDK & CMake + uses: actions/cache@v3 + with: + path: ${{ env.ANDROID_SDK_ROOT }} + key: ${{ env.CACHE_KEY }}-android + restore-keys: | + ${{ env.CACHE_KEY }}-android- + + + - name: Install Android SDK, NDK and CMake (if needed) + if: steps.cache-android.outputs.cache-hit != 'true' run: | 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 + apt-get install -y wget zip + wget https://dl.google.com/android/repository/commandlinetools-linux-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 + mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools/latest" + mv cmdline-tools/* "$ANDROID_SDK_ROOT/cmdline-tools/latest/" + yes | "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" --licenses 2>/dev/null || true + # Install NDK and CMake if you need them. Add the commands here (example) + # yes | "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" "ndk;cmake" 2>/dev/null || true + - name: Set up Android environment variables run: | - echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV - echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV - echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV + echo "ANDROID_SDK_ROOT=${{ env.ANDROID_SDK_ROOT }}" >> $GITHUB_ENV + echo "PATH=$PATH:${{ env.ANDROID_SDK_ROOT }}/cmdline-tools/latest/bin:${{ env.ANDROID_SDK_ROOT }}/platform-tools:${{ env.ANDROID_SDK_ROOT }}/build-tools/30.0.3" >> $GITHUB_ENV + echo "ANDROID_HOME=${{ env.ANDROID_HOME }}" >> $GITHUB_ENV + - name: Install jq - run: | - apt-get install -y jq + run: apt-get install -y jq - - id: flutter-action + - name: Cache Flutter + uses: actions/cache@v3 + with: + path: ~/.flutter + key: ${{ env.CACHE_KEY }}-flutter + restore-keys: | + ${{ env.CACHE_KEY }}-flutter- + + + - name: Set up Flutter uses: actions/flutter-action@v2 with: channel: ${{ env.flutter_channel }} flutter-version: ${{ env.flutter_version }} - cache: true + cache: true # This is redundant because we use actions/cache above - - name: Fix dir permissions + + - name: Fix dir permissions (Often unnecessary with actions/flutter-action) 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 doctor -v + flutter doctor -v - name: Get dependencies run: flutter pub get @@ -63,23 +99,21 @@ jobs: run: flutter analyze - name: Test - run: | - flutter test + run: flutter test - name: Build apk - run: | - flutter build apk + run: flutter build apk --split-per-abi - name: Rename and move apk run: | TIMESTAMP=$(date +'%Y-%m-%d-%H-%M') APK_NAME="eatvio_app_${TIMESTAMP}.apk" - mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME + 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 with: name: ${{ env.APK_NAME }} - path: ${{ env.APK_NAME }} + path: ${{ env.APK_NAME }} \ No newline at end of file From 57065bd3d58a2c3f65eaa6e29e5c7ea98c628bcd Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:45:38 +0300 Subject: [PATCH 28/35] fix: try2 --- .gitea/workflows/test.yml | 85 +++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 49 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 93e76b48..598dffb5 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -6,91 +6,76 @@ env: flutter_version: "3.24.5" java_version: "21.x" flutter_channel: "stable" - ANDROID_SDK_ROOT: /root/Android/Sdk # Define this consistently - ANDROID_HOME: ${{ env.ANDROID_SDK_ROOT }} # Link ANDROID_HOME to ANDROID_SDK_ROOT - CACHE_KEY: ${{ runner.os }}-jdk-${{ env.java_version }}-flutter-${{ env.flutter_version }} jobs: build: - runs-on: [ dev-office ] + runs-on: [dev-office] steps: - uses: actions/checkout@v3 + # Кэширование JDK - name: Cache JDK uses: actions/cache@v3 with: - path: ${{ env.JDK_HOME }} # You'll need to define JDK_HOME in a subsequent step - key: ${{ env.CACHE_KEY }}-jdk - restore-keys: | - ${{ env.CACHE_KEY }}-jdk- + path: ~/.cache/zulu + key: ${{ runner.os }}-zulu-${{ hashFiles('**/pom.xml') }} # Или любой файл для определения изменения - name: Set up JDK uses: actions/setup-java@v3 with: distribution: "zulu" java-version: ${{ env.java_version }} - id: setup-jdk - # Set the JDK_HOME after the JDK installation. - # This is necessary for caching. - run: | - echo "JDK_HOME=$(echo "${{ steps.setup-jdk.outputs.java-home }}")" >> $GITHUB_ENV + id: setup-jdk - - - name: Cache Android SDK, NDK & CMake + # Кэширование Android SDK + - name: Cache Android SDK uses: actions/cache@v3 with: - path: ${{ env.ANDROID_SDK_ROOT }} - key: ${{ env.CACHE_KEY }}-android - restore-keys: | - ${{ env.CACHE_KEY }}-android- + path: $HOME/Android/Sdk + key: ${{ runner.os }}-android-sdk-${{ hashFiles('**/build.gradle') }} # Укажите файл для хеширования - - - name: Install Android SDK, NDK and CMake (if needed) - if: steps.cache-android.outputs.cache-hit != 'true' + - name: Install Android SDK run: | apt-get update - apt-get install -y wget zip - wget https://dl.google.com/android/repository/commandlinetools-linux-latest.zip -O commandlinetools.zip + 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 "$ANDROID_SDK_ROOT/cmdline-tools/latest" - mv cmdline-tools/* "$ANDROID_SDK_ROOT/cmdline-tools/latest/" - yes | "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" --licenses 2>/dev/null || true - # Install NDK and CMake if you need them. Add the commands here (example) - # yes | "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" "ndk;cmake" 2>/dev/null || true - + 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 - name: Set up Android environment variables run: | - echo "ANDROID_SDK_ROOT=${{ env.ANDROID_SDK_ROOT }}" >> $GITHUB_ENV - echo "PATH=$PATH:${{ env.ANDROID_SDK_ROOT }}/cmdline-tools/latest/bin:${{ env.ANDROID_SDK_ROOT }}/platform-tools:${{ env.ANDROID_SDK_ROOT }}/build-tools/30.0.3" >> $GITHUB_ENV - echo "ANDROID_HOME=${{ env.ANDROID_HOME }}" >> $GITHUB_ENV - + echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV + echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV + echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV - name: Install jq - run: apt-get install -y jq + run: | + apt-get install -y jq + # Кэширование Flutter SDK - name: Cache Flutter uses: actions/cache@v3 with: - path: ~/.flutter - key: ${{ env.CACHE_KEY }}-flutter - restore-keys: | - ${{ env.CACHE_KEY }}-flutter- + path: ~/.pub-cache + key: ${{ runner.os }}-flutter-${{ env.flutter_version }}-${{ hashFiles('**/pubspec.yaml') }} # Укажите файл для хеширования - - - name: Set up Flutter + - id: flutter-action uses: actions/flutter-action@v2 with: channel: ${{ env.flutter_channel }} flutter-version: ${{ env.flutter_version }} - cache: true # This is redundant because we use actions/cache above + cache: true - - - name: Fix dir permissions (Often unnecessary with actions/flutter-action) + - name: Fix dir permissions 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 doctor -v + flutter doctor -v - name: Get dependencies run: flutter pub get @@ -99,18 +84,20 @@ jobs: run: flutter analyze - name: Test - run: flutter test + run: | + flutter test - name: Build apk - run: flutter build apk --split-per-abi + run: | + flutter build apk - name: Rename and move apk run: | TIMESTAMP=$(date +'%Y-%m-%d-%H-%M') APK_NAME="eatvio_app_${TIMESTAMP}.apk" - mv build/app/outputs/flutter-apk/app-release.apk "$APK_NAME" + 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 From e1f83adecaba443d02a1d2f2f31adf535e4ddb59 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:50:09 +0300 Subject: [PATCH 29/35] fix: =o1 --- .gitea/workflows/test.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 598dffb5..d85aff23 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -14,12 +14,11 @@ jobs: steps: - uses: actions/checkout@v3 - # Кэширование JDK - name: Cache JDK uses: actions/cache@v3 with: path: ~/.cache/zulu - key: ${{ runner.os }}-zulu-${{ hashFiles('**/pom.xml') }} # Или любой файл для определения изменения + key: ${{ runner.os }}-jdk-${{ hashFiles('**/gradle-wrapper.properties') }} - name: Set up JDK uses: actions/setup-java@v3 @@ -28,12 +27,13 @@ jobs: java-version: ${{ env.java_version }} id: setup-jdk - # Кэширование Android SDK - name: Cache Android SDK uses: actions/cache@v3 with: path: $HOME/Android/Sdk - key: ${{ runner.os }}-android-sdk-${{ hashFiles('**/build.gradle') }} # Укажите файл для хеширования + key: ${{ runner.os }}-android-sdk-${{ hashFiles('**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-android-sdk- - name: Install Android SDK run: | @@ -57,13 +57,6 @@ jobs: run: | apt-get install -y jq - # Кэширование Flutter SDK - - name: Cache Flutter - uses: actions/cache@v3 - with: - path: ~/.pub-cache - key: ${{ runner.os }}-flutter-${{ env.flutter_version }}-${{ hashFiles('**/pubspec.yaml') }} # Укажите файл для хеширования - - id: flutter-action uses: actions/flutter-action@v2 with: From db256d3e0aadf5ff3b4ff0d91995a6c68bfa3b33 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:51:10 +0300 Subject: [PATCH 30/35] fix: =o12 --- .gitea/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index d85aff23..ced9158d 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -18,7 +18,7 @@ jobs: uses: actions/cache@v3 with: path: ~/.cache/zulu - key: ${{ runner.os }}-jdk-${{ hashFiles('**/gradle-wrapper.properties') }} + key: jdk-${{ runner.os }}-${{ hashFiles('**/gradle-wrapper.properties') }} - name: Set up JDK uses: actions/setup-java@v3 @@ -31,9 +31,9 @@ jobs: uses: actions/cache@v3 with: path: $HOME/Android/Sdk - key: ${{ runner.os }}-android-sdk-${{ hashFiles('**/gradle-wrapper.properties') }} + key: android-sdk-${{ runner.os }}-${{ hashFiles('**/gradle-wrapper.properties') }} restore-keys: | - ${{ runner.os }}-android-sdk- + android-sdk-${{ runner.os }}- - name: Install Android SDK run: | From e482e1b6f95e4176f4b01f19eaa5e3d2cd1cdd31 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:52:21 +0300 Subject: [PATCH 31/35] fix: =o122 --- .gitea/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index ced9158d..5b9f999e 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -18,8 +18,7 @@ jobs: uses: actions/cache@v3 with: path: ~/.cache/zulu - key: jdk-${{ runner.os }}-${{ hashFiles('**/gradle-wrapper.properties') }} - + key: jdk-${{ runner.os }}-java-${{ env.java_version }} - name: Set up JDK uses: actions/setup-java@v3 with: From 32891fee5aba2183d6c62b3365d1b211c215c935 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:53:44 +0300 Subject: [PATCH 32/35] fix: =o1223 --- .gitea/workflows/test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 5b9f999e..37ceed52 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -19,6 +19,7 @@ jobs: with: path: ~/.cache/zulu key: jdk-${{ runner.os }}-java-${{ env.java_version }} + - name: Set up JDK uses: actions/setup-java@v3 with: @@ -30,9 +31,9 @@ jobs: uses: actions/cache@v3 with: path: $HOME/Android/Sdk - key: android-sdk-${{ runner.os }}-${{ hashFiles('**/gradle-wrapper.properties') }} + key: android-sdk-${{ runner.os }}-sdk-${{ hashFiles('**/gradle-wrapper.properties') }} restore-keys: | - android-sdk-${{ runner.os }}- + android-sdk-${{ runner.os }}-sdk- - name: Install Android SDK run: | From 3aa2f20eef627aabc14bd9644d4db19ded91131b Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 15:58:52 +0300 Subject: [PATCH 33/35] fix: 1111 --- .gitea/workflows/test.yml | 40 ++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 37ceed52..c22a1059 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -18,7 +18,7 @@ jobs: uses: actions/cache@v3 with: path: ~/.cache/zulu - key: jdk-${{ runner.os }}-java-${{ env.java_version }} + key: jdk-${{ runner.os }}-java-${{ env.java_version }} # Ключ для JDK - name: Set up JDK uses: actions/setup-java@v3 @@ -27,25 +27,44 @@ 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 # Ключ для cmdline-tools + restore-keys: | + android-cmdline-tools-${{ runner.os }}-sdk + - name: Cache Android SDK uses: actions/cache@v3 with: path: $HOME/Android/Sdk - key: android-sdk-${{ runner.os }}-sdk-${{ hashFiles('**/gradle-wrapper.properties') }} + key: android-sdk-${{ runner.os }}-sdk # Ключ для Android SDK restore-keys: | - android-sdk-${{ runner.os }}-sdk- + android-sdk-${{ runner.os }}-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 }}- - name: Install Android SDK run: | - 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/ + 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 + 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: | @@ -62,7 +81,6 @@ jobs: with: channel: ${{ env.flutter_channel }} flutter-version: ${{ env.flutter_version }} - cache: true - name: Fix dir permissions run: | From d49af871205cae5e7437f101c611f573a3999495 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 16:00:29 +0300 Subject: [PATCH 34/35] fix: 2222 --- .gitea/workflows/test.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index c22a1059..ad555613 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -31,17 +31,21 @@ jobs: uses: actions/cache@v3 with: path: $HOME/Android/Sdk/cmdline-tools - key: android-cmdline-tools-${{ runner.os }}-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 # Ключ для 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 @@ -50,6 +54,7 @@ jobs: 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: | From 0f47d67922d81cc1f216542b856d2c022fec5385 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Mon, 18 Nov 2024 16:10:41 +0300 Subject: [PATCH 35/35] 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 }}