From eaabade12af2b2d60e0f19e998de444d736fba54 Mon Sep 17 00:00:00 2001 From: Pete Gregory Date: Thu, 11 Dec 2025 01:31:39 +0000 Subject: [PATCH] fix release pipeline --- .gitea/workflows/release.yml | 30 ++++++++---------------------- lib/components/pages/traction.dart | 18 ++++++++++-------- 2 files changed, 18 insertions(+), 30 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 7fa7ed6..db4ae85 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -43,7 +43,7 @@ jobs: SUDO="" fi $SUDO apt-get update - $SUDO apt-get install -y unzip xz-utils zip libstdc++6 liblzma-dev curl + $SUDO apt-get install -y unzip xz-utils zip libstdc++6 liblzma-dev curl jq - name: Setup Java uses: actions/setup-java@v4 @@ -58,9 +58,12 @@ jobs: unzip -q /tmp/cli-tools.zip -d "$ANDROID_SDK_ROOT"/cmdline-tools mv "$ANDROID_SDK_ROOT"/cmdline-tools/cmdline-tools "$ANDROID_SDK_ROOT"/cmdline-tools/latest - yes | "$ANDROID_SDK_ROOT"/cmdline-tools/latest/bin/sdkmanager --sdk_root="$ANDROID_SDK_ROOT" --licenses + # Accept licences (ignore SIGPIPE exit 141) + yes | "$ANDROID_SDK_ROOT"/cmdline-tools/latest/bin/sdkmanager --sdk_root="$ANDROID_SDK_ROOT" --licenses || true + + # Install required packages (also ignore SIGPIPE) yes | "$ANDROID_SDK_ROOT"/cmdline-tools/latest/bin/sdkmanager --sdk_root="$ANDROID_SDK_ROOT" \ - "platform-tools" "platforms;android-33" "build-tools;33.0.2" + "platform-tools" "platforms;android-33" "build-tools;33.0.2" || true echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> "$GITHUB_ENV" echo "$ANDROID_SDK_ROOT/platform-tools" >> "$GITHUB_PATH" @@ -100,7 +103,7 @@ jobs: SUDO="" fi $SUDO apt-get update - $SUDO apt-get install -y unzip xz-utils zip libstdc++6 libglu1-mesa clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev curl + $SUDO apt-get install -y unzip xz-utils zip libstdc++6 libglu1-mesa clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev curl jq - name: Setup Flutter uses: subosito/flutter-action@v2 @@ -265,21 +268,4 @@ jobs: FILES="artifacts/app-${BASE}.apk" FILES="${FILES}"$'\n'"artifacts/app-linux-x64-${BASE}.tar.gz" if [ -f "artifacts/app-windows-x64-${BASE}.zip" ]; then - FILES="${FILES}"$'\n'"artifacts/app-windows-x64-${BASE}.zip" - fi - - { - echo "tag=${TAG}" - echo 'files<> "$GITHUB_OUTPUT" - - - name: Create release on Gitea - uses: ncipollo/release-action@v1 - with: - tag: ${{ steps.bundle.outputs.tag }} - name: ${{ steps.bundle.outputs.tag }} - prerelease: false - token: ${{ secrets.GITEA_TOKEN }} - artifacts: ${{ steps.bundle.outputs.files }} +::contentReference[oaicite:0]{index=0} diff --git a/lib/components/pages/traction.dart b/lib/components/pages/traction.dart index 441a4ec..0885ec9 100644 --- a/lib/components/pages/traction.dart +++ b/lib/components/pages/traction.dart @@ -22,7 +22,7 @@ class TractionPage extends StatefulWidget { class _TractionPageState extends State { final _classController = TextEditingController(); final _numberController = TextEditingController(); - bool _hadOnly = true; + bool _mileageFirst = true; bool _initialised = false; bool _showAdvancedFilters = false; String? _selectedClass; @@ -96,13 +96,15 @@ class _TractionPageState extends State { "domain": _domainController.text.trim(), "type": _typeController.text.trim(), }..removeWhere((key, value) => value.isEmpty); + final hadOnly = !_hasFilters; await data.fetchTraction( - hadOnly: _hadOnly && !_hasFilters, + hadOnly: hadOnly, locoClass: _selectedClass ?? _classController.text.trim(), locoNumber: _numberController.text.trim(), offset: append ? data.traction.length : 0, append: append, filters: filters, + mileageFirst: _mileageFirst, ); } @@ -124,9 +126,7 @@ class _TractionPageState extends State { } setState(() { _selectedClass = null; - }); - setState(() { - _hadOnly = true; + _mileageFirst = true; }); _refreshTraction(); } @@ -258,10 +258,12 @@ class _TractionPageState extends State { ), ), FilterChip( - label: const Text('Had first'), - selected: _hadOnly, + label: Text( + _mileageFirst ? 'Mileage first' : 'Had first', + ), + selected: _mileageFirst, onSelected: (v) { - setState(() => _hadOnly = v); + setState(() => _mileageFirst = v); _refreshTraction(); }, ),