From 7375f39ffb8538e0262f5c437dcce5291db2802b Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Mon, 16 Nov 2026 12:07:12 -0500 Subject: [PATCH] add some stuff for reproducable builds --- .github/workflows/android.yml | 5 ++++- linux/nix/devshell.nix | 16 ++++++++++++++-- scripts/build_avif_native.sh | 12 ++++++++++++ 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 scripts/build_avif_native.sh diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index cf64422..be98c19 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -27,7 +27,10 @@ jobs: KEYSTORE_CONTENT: ${{ secrets.KEYSTORE_CONTENT }} - name: Build app - run: nix develop --command bash -c "flutter pub get && dart scripts/generate.dart && flutter pub run build_runner build && flutter build apk --target-platform android-arm64 --split-per-abi --dart-define=GIT_COMMIT=${{ github.sha }}" + run: | + export PUB_CACHE=$PWD/.pub-cache + export GOTOOLCHAIN=go$(sed -n -E 's/^toolchain go([0-9.]+)$/\1/p' gomuks/go.mod) + nix develop --command bash -c "flutter pub get --enforce-lockfile && bash scripts/build_avif_native.sh && dart scripts/generate.dart && flutter pub run build_runner build && flutter build apk --target-platform android-arm64 --split-per-abi --dart-define=GIT_COMMIT=${{ github.sha }}" env: KEYSTORE_PATH: ../../keystore.jks KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} diff --git a/linux/nix/devshell.nix b/linux/nix/devshell.nix index 02bfdff..1f02b67 100644 --- a/linux/nix/devshell.nix +++ b/linux/nix/devshell.nix @@ -1,5 +1,6 @@ { pkgs, lib }: let + ndkVersion = "28.2.13676358"; android = pkgs.androidenv.composeAndroidPackages { toolsVersion = "26.1.1"; platformToolsVersion = "37.0.1"; @@ -19,12 +20,22 @@ let "arm64-v8a" ]; includeNDK = true; - ndkVersions = [ "28.2.13676358" ]; + ndkVersions = [ ndkVersion ]; }; buildEnv = import ./build_env.nix { inherit pkgs lib; }; in pkgs.mkShell { - packages = buildEnv.packages ++ [ android.platform-tools ]; + packages = + buildEnv.packages + ++ [ android.platform-tools ] + # For scripts/build_avif_native.sh + ++ (with pkgs; [ + cmake + jq + meson + ninja + python3 + ]); env = rec { @@ -32,6 +43,7 @@ pkgs.mkShell { ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk"; ANDROID_SDK_ROOT = ANDROID_HOME; + ANDROID_NDK_HOME = "${ANDROID_HOME}/ndk/${ndkVersion}"; JAVA_HOME = pkgs.jdk21; GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_HOME}/build-tools/36.0.0/aapt2"; diff --git a/scripts/build_avif_native.sh b/scripts/build_avif_native.sh new file mode 100644 index 0000000..e94f87c --- /dev/null +++ b/scripts/build_avif_native.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +set -euo pipefail + +cd "${PUB_CACHE:-$HOME/.pub-cache}"/hosted/pub.dev/avif_native-* + +bash tool/native/build_unix.sh android-arm64 decode-dav1d + +library=dist/android-arm64/decode-dav1d/libavif_native.so +jq --arg path "../$library" --arg hash "$(sha256sum "$library" | cut -d " " -f 1)" \ + '.artifacts["android-arm64-decode-dav1d"] |= {path: $path, librarySha256: $hash, fileName}' \ + native/manifest.json > manifest.json +mv manifest.json native/manifest.json