diff --git a/.flutter b/.flutter index d63987f..67457e6 160000 --- a/.flutter +++ b/.flutter @@ -1 +1 @@ -Subproject commit d63987f71d63dca9126f25f4ae810dbf3e511ad6 +Subproject commit 67457e669f79e9f8d13d7a68fe09775fefbb79f4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d3b5a05..02ae810 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,16 +23,27 @@ jobs: gpg_private_key: ${{ secrets.PGP_KEY_BASE64 }} passphrase: ${{ secrets.PGP_PASSPHRASE }} + - name: Check submodule + id: check_submodule + run: | + SUBMODULE_COMMIT="$(cd .flutter; git rev-parse --short HEAD; cd ..)" + FLUTTER_COMMIT="$(flutter --version | head -2 | tail -1 | awk '{print $4}')" + echo "SUBMODULE_COMMIT=$SUBMODULE_COMMIT, FLUTTER_COMMIT=$FLUTTER_COMMIT" + if [ "$SUBMODULE_COMMIT" != "$FLUTTER_COMMIT" ]; then + echo "Your submodule has not been updated!" + exit 1 + fi + - name: Extract Version id: extract_version run: | - VERSION=$(grep -oP "^version: [^\+]+" pubspec.yaml | tail -c +10) - echo "version=$VERSION" >> $GITHUB_OUTPUT - if [ ${{ inputs.beta }} == true ]; then BETA=true; else BETA=false; fi - echo "beta=$BETA" >> $GITHUB_OUTPUT - TAG="v$VERSION" - if [ $BETA == true ]; then TAG="$TAG"-beta; fi - echo "tag=$TAG" >> $GITHUB_OUTPUT + VERSION=$(grep -oP "^version: [^\+]+" pubspec.yaml | tail -c +10) + echo "version=$VERSION" >> $GITHUB_OUTPUT + if [ ${{ inputs.beta }} == true ]; then BETA=true; else BETA=false; fi + echo "beta=$BETA" >> $GITHUB_OUTPUT + TAG="v$VERSION" + if [ $BETA == true ]; then TAG="$TAG"-beta; fi + echo "tag=$TAG" >> $GITHUB_OUTPUT - name: Build APKs run: | diff --git a/build.sh b/build.sh index 26dc8b9..baadadb 100755 --- a/build.sh +++ b/build.sh @@ -7,6 +7,9 @@ trap "cd "$CURR_DIR"" EXIT if [ -z "$1" ]; then git fetch && git merge origin/main && git push # Typically run after a PR to main, so bring dev up to date fi +cd .flutter +git checkout "$(flutter --version | head -2 | tail -1 | awk '{print $4}')" # Ensure included Flutter submodule version equals my environment +cd .. rm ./build/app/outputs/flutter-apk/* 2>/dev/null # Get rid of older builds if any flutter build apk --flavor normal && flutter build apk --split-per-abi --flavor normal # Build (both split and combined APKs) for file in ./build/app/outputs/flutter-apk/app-*normal*.apk*; do mv "$file" "${file//-normal/}"; done