Simplify release workflow

Author: HalidOdat

.github/workflows/release.yml

@@ -10,10 +10,6 @@ env:
   # https://github.com/android-actions/setup-android?tab=readme-ov-file#sdk-version-selection
   CMDLINE_TOOLS_VERSION: 10406996 # 11.0
 
-  # Pin build path for reproducible builds.
-  BUILD_PATH: /tmp/build
-  PUB_CACHE: /tmp/.pub-cache
-
 permissions:
   contents: write
 
@@ -26,18 +22,10 @@ jobs:
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v4
-        with:
-          path: repository
-
-      - name: Move to /tmp directory
-        run: mv repository "$BUILD_PATH"
 
       - name: Disable rustup auto-self-update
         run: rustup set auto-self-update disable
 
-      - name: Setup rust cache
-        uses: Swatinem/rust-cache@v2
-
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
@@ -53,42 +41,19 @@ jobs:
       - name: Access Android SDK build-tools
         run: echo "$ANDROID_HOME/build-tools"/*/ | awk -F' ' '{ print $1 }' >> $GITHUB_PATH
 
-      # Cache the directory
-      - name: Cache directory
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.BUILD_PATH }}/app/build
-          # Define a key for the cache, commonly includes the hash of dependencies
-          key: ${{ runner.os }}-app-build-${{ hashFiles('**/pubspec.yaml') }}
-          # Define a restore key if an exact match is not found
-          restore-keys: |
-            ${{ runner.os }}-app-build-
-
       - name: Build APKs
-        working-directory: ${{ env.BUILD_PATH }}
         run: |
-          # Remove non-reproducable part of path strings.
-          SEP=$(echo -e "\x1f")
-          export CARGO_ENCODED_RUSTFLAGS="--remap-path-prefix=${HOME}/.cargo=/cargo/"
-          if [ ! -z "$CARGO_HOME" ]; then
-            export CARGO_ENCODED_RUSTFLAGS="$CARGO_ENCODED_RUSTFLAGS${SEP}--remap-path-prefix=${CARGO_HOME}=/cargo/"
-          fi
-
-          export SOURCE_DATE_EPOCH=1
-          export ZERO_AR_DATE=1
-
-          cd app
-          ./flutter build apk --release --split-per-abi
-          ./flutter build apk --release
+          # Use the same build dir, this speeds up the build process
+          export REUSE_BUILD=1
+          ./scripts/reproducible apk --release --split-per-abi
+          ./scripts/reproducible apk --release
 
       - name: Archive mappings
-        working-directory: ${{ env.BUILD_PATH }}
         run: |
-          mv app/build/app/outputs/mapping/{release,mapping}
-          tar -czvf mapping.tar.gz --directory=app/build/app/outputs/mapping mapping
+          mv app/build/reproducible/mapping/{release,mapping}
+          tar -czvf mapping.tar.gz --directory=app/build/reproducible/mapping mapping
 
       - name: Sign APKs
-        working-directory: ${{ env.BUILD_PATH }}
         env:
           KEYSTORE: ${{ secrets.KEYSTORE }}
           KEYALIAS: ${{ secrets.KEYALIAS }}
@@ -105,52 +70,47 @@ jobs:
               --v1-signing-enabled true \
               --v2-signing-enabled true \
               --v3-signing-enabled true \
-              --out "${name}.apk" \
-              "app/build/app/outputs/flutter-apk/app-${name}.apk"
+              --out "app-${name}.apk" \
+              "app/build/reproducible/flutter-apk/app-${name}.apk"
           done
           rm keystore.p12
 
       - name: Upload Arifact armeabi-v7a
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: "${{ env.BUILD_PATH }}/armeabi-v7a-release.apk"
+          file: "app-armeabi-v7a-release.apk"
           asset_name: stride-armeabi-v7a.apk
-          override: true
           tag: ${{ github.ref }}
 
       - name: Upload Arifact arm64-v8a
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: "${{ env.BUILD_PATH }}/arm64-v8a-release.apk"
+          file: "app-arm64-v8a-release.apk"
           asset_name: stride-arm64-v8a.apk
-          override: true
           tag: ${{ github.ref }}
 
       - name: Upload Arifact x86_64
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: "${{ env.BUILD_PATH }}/x86_64-release.apk"
+          file: "app-x86_64-release.apk"
           asset_name: stride-x86_64.apk
-          override: true
           tag: ${{ github.ref }}
 
       - name: Upload Arifact Universal
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: "${{ env.BUILD_PATH }}/release.apk"
+          file: "app-release.apk"
           asset_name: stride.apk
-          override: true
           tag: ${{ github.ref }}
 
       - name: Upload Arifact Mapping
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: "${{ env.BUILD_PATH }}/mapping.tar.gz"
+          file: "mapping.tar.gz"
           asset_name: mapping.tar.gz
-          override: true
           tag: ${{ github.ref }}

app/flutter

@@ -5,6 +5,8 @@ VERSION=3.24.0
 APP_DIR="$( cd "$( dirname "$0" )" && pwd )"
 FLUTTER_DIR="$APP_DIR/.flutter"
 
+cd "$APP_DIR"
+
 if [ -e "$FLUTTER_DIR" ]; then
     exec "$FLUTTER_DIR"/bin/flutter $@
 fi

app/scripts/reproducible

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+set -x
+
+SCRIPTS_DIR="$( cd "$( dirname "$0" )" && pwd )"
+PROJECT_DIR="$SCRIPTS_DIR/.."
+
+APPLICATION_ID="org.stridetasks.stride"
+BUILD_DIR="/tmp/$APPLICATION_ID"
+
+cd "$PROJECT_DIR"
+
+# Remove non-reproducable part of path strings.
+SEP=$(echo -e "\x1f")
+export CARGO_ENCODED_RUSTFLAGS="--remap-path-prefix=${HOME}/.cargo=/cargo/"
+if [ ! -z "$CARGO_HOME" ]; then
+    export CARGO_ENCODED_RUSTFLAGS="$CARGO_ENCODED_RUSTFLAGS${SEP}--remap-path-prefix=${CARGO_HOME}=/cargo/"
+fi
+
+export SOURCE_DATE_EPOCH=1
+export ZERO_AR_DATE=1
+
+set -xe
+
+# In CI reuse the same build folder, since we are building the same commit
+# this should be fine.
+if [ -z "$REUSE_BUILD" ]; then
+    rm -rf "$BUILD_DIR"
+else
+    echo "INFO: Reusing existing build directory $BUILD_DIR"
+fi
+
+if [ ! -e "$BUILD_DIR" ]; then
+    COMMIT="$(git rev-parse HEAD)"
+    ORIGIN="$(git remote get-url origin)"
+    git clone --filter=blob:none --reference-if-able "$PROJECT_DIR" "$ORIGIN" "$BUILD_DIR"
+    git -C "$BUILD_DIR" reset --hard "$COMMIT"
+fi
+
+cd "$BUILD_DIR"
+
+./scripts/rustup-setup
+./app/flutter build $@
+
+rm -rf "$PROJECT_DIR"/app/reproducible/apks
+mkdir -p "$PROJECT_DIR"/app/build/reproducible
+cp -r app/build/app/outputs/* "$PROJECT_DIR"/app/build/reproducible