From 963c15636c1f3dd898699f979a3452cc814e1a1e Mon Sep 17 00:00:00 2001 From: austinried <4966622+austinried@users.noreply.github.com> Date: Fri, 28 Apr 2023 11:40:56 +0900 Subject: [PATCH] aab build, release signing clean up analyze issues --- .github/workflows/build-flutter-release.yml | 79 +++++++++++++++++++++ .github/workflows/build-flutter.yml | 35 ++++----- analysis_options.yaml | 4 ++ lib/app/pages/source_page.dart | 1 - lib/http/client.dart | 3 +- lib/services/audio_service.dart | 9 ++- 6 files changed, 105 insertions(+), 26 deletions(-) create mode 100644 .github/workflows/build-flutter-release.yml diff --git a/.github/workflows/build-flutter-release.yml b/.github/workflows/build-flutter-release.yml new file mode 100644 index 0000000..83d4aa6 --- /dev/null +++ b/.github/workflows/build-flutter-release.yml @@ -0,0 +1,79 @@ +name: build-flutter + +on: + push: + branches: + - v2 + +jobs: + build-apk: + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v3 + + - name: Get subtracks version + run: echo "SUBTRACKS_VERSION=$(yq '.version' pubspec.yaml)" >> $GITHUB_ENV + + - uses: subosito/flutter-action@v2 + with: + flutter-version: '3.7.11' + channel: 'stable' + cache: true + + - run: flutter pub get + - run: cp .env.example .env + + - name: Retrieve subtracks.keystore + env: + SUBTRACKS_KEYSTORE_BASE64: ${{ secrets.SUBTRACKS_KEYSTORE_BASE64 }} + run: | + echo "$SUBTRACKS_KEYSTORE_BASE64" | base64 --decode > android/subtracks.keystore + - name: Retrieve key.properties + env: + SUBTRACKS_KEYPROPERTIES_BASE64: ${{ secrets.SUBTRACKS_KEYPROPERTIES_BASE64 }} + run: | + echo "$SUBTRACKS_KEYPROPERTIES_BASE64" | base64 --decode > android/key.properties + + - run: flutter build apk -PsignRelease + + - run: mv build/app/outputs/flutter-apk/app-release.apk subtracks-${SUBTRACKS_VERSION}.apk + - uses: actions/upload-artifact@v3 + with: + name: subtracks-release-apk + path: subtracks-*.apk + + build-aab: + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v3 + + - name: Get subtracks version + run: echo "SUBTRACKS_VERSION=$(yq '.version' pubspec.yaml)" >> $GITHUB_ENV + + - uses: subosito/flutter-action@v2 + with: + flutter-version: '3.7.11' + channel: 'stable' + cache: true + + - run: flutter pub get + - run: cp .env.example .env + + - name: Retrieve subtracks.keystore + env: + SUBTRACKS_KEYSTORE_BASE64: ${{ secrets.SUBTRACKS_KEYSTORE_BASE64 }} + run: | + echo "$SUBTRACKS_KEYSTORE_BASE64" | base64 --decode > android/subtracks.keystore + - name: Retrieve key.properties + env: + SUBTRACKS_KEYPROPERTIES_BASE64: ${{ secrets.SUBTRACKS_KEYPROPERTIES_BASE64 }} + run: | + echo "$SUBTRACKS_KEYPROPERTIES_BASE64" | base64 --decode > android/key.properties + + - run: flutter build appbundle -PsignRelease + + - run: mv build/app/outputs/bundle/release/app-release.aab subtracks-${SUBTRACKS_VERSION}.aab + - uses: actions/upload-artifact@v3 + with: + name: subtracks-release-aab + path: subtracks-*.aab diff --git a/.github/workflows/build-flutter.yml b/.github/workflows/build-flutter.yml index ec96528..d1b747b 100644 --- a/.github/workflows/build-flutter.yml +++ b/.github/workflows/build-flutter.yml @@ -11,26 +11,19 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Get subtracks version - run: echo "SUBTRACKS_VERSION=$(yq '.version' pubspec.yaml)" >> $GITHUB_ENV - - - run: echo ${SUBTRACKS_VERSION} + - uses: subosito/flutter-action@v2 + with: + flutter-version: '3.7.11' + channel: 'stable' + cache: true - # - uses: subosito/flutter-action@v2 - # with: - # flutter-version: '3.7.11' - # channel: 'stable' - # cache: true + - run: flutter pub get + - run: flutter analyze + - run: cp .env.example .env + - run: flutter build apk - # - run: cp .env.example .env - - # - run: flutter pub get - # - run: flutter build apk - - # - run: > - # mv build/app/outputs/flutter-apk/app-release.apk - # subtracks-$(git rev-parse --short HEAD).apk - # - uses: actions/upload-artifact@v3 - # with: - # name: subtracks-testing - # path: subtracks-*.apk + - run: mv build/app/outputs/flutter-apk/app-release.apk subtracks-$(git rev-parse --short HEAD).apk + - uses: actions/upload-artifact@v3 + with: + name: subtracks-testing + path: subtracks-*.apk diff --git a/analysis_options.yaml b/analysis_options.yaml index 3524d79..3b059d1 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -5,6 +5,10 @@ linter: prefer_relative_imports: true analyzer: + exclude: + - '**.freezed.dart' + - '**.g.dart' + - '**.gr.dart' plugins: # broken currently and may not get fixed # https://github.com/simolus3/drift/issues/2342 diff --git a/lib/app/pages/source_page.dart b/lib/app/pages/source_page.dart index 30915d7..268544d 100644 --- a/lib/app/pages/source_page.dart +++ b/lib/app/pages/source_page.dart @@ -148,7 +148,6 @@ class SourcePage extends HookConsumerWidget { } } catch (err) { // TOOD: toast the error or whatever - print(err); error = true; } finally { isSaving.value = false; diff --git a/lib/http/client.dart b/lib/http/client.dart index 56bc1d2..f58c777 100644 --- a/lib/http/client.dart +++ b/lib/http/client.dart @@ -1,3 +1,4 @@ +import 'package:flutter/foundation.dart'; import 'package:http/http.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; @@ -13,7 +14,7 @@ class SubtracksHttpClient extends BaseClient { @override Future send(BaseRequest request) { request.headers.addAll(subtracksHeaders); - print('${request.method} ${request.url}'); + if (kDebugMode) print('${request.method} ${request.url}'); return request.send(); } } diff --git a/lib/services/audio_service.dart b/lib/services/audio_service.dart index 8c15aa2..9b67689 100644 --- a/lib/services/audio_service.dart +++ b/lib/services/audio_service.dart @@ -4,6 +4,7 @@ import 'dart:math'; import 'package:audio_service/audio_service.dart'; import 'package:collection/collection.dart'; import 'package:drift/drift.dart' show Value; +import 'package:flutter/foundation.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:just_audio/just_audio.dart'; import 'package:pool/pool.dart'; @@ -698,7 +699,9 @@ class AudioControl extends BaseAudioHandler with QueueHandler, SeekHandler { } void yell(String msg) { - print('===================================================================<'); - print(msg); - print('===================================================================>'); + if (kDebugMode) { + print('=================================================================<'); + print(msg); + print('=================================================================>'); + } }