Komodo Wallet 0.9.2 Release: Merge pull request GLEECBTC#2850 from KomodoPlatform/dev

chore(release): Komodo Wallet 0.9.2 Release

Author: CharlVS

.devcontainer/Dockerfile

@@ -1,6 +1,6 @@
 FROM docker.io/ubuntu:22.04
 
-ENV FLUTTER_VERSION="3.29.2"
+ENV FLUTTER_VERSION="3.32.5"
 ENV USER="komodo"
 ENV USER_ID=1000
 ENV PATH=$PATH:/opt/flutter/bin

.docker/android-sdk.dockerfile

@@ -4,7 +4,8 @@ FROM docker.io/ubuntu:22.04
 # LABEL org.opencontainers.image.source=https://github.com/cirruslabs/docker-images-android
 
 ENV USER="komodo"
-ENV USER_ID=1000
+ARG BUILD_USER_ID=1000
+ENV USER_ID=${BUILD_USER_ID}
 
 RUN apt update && apt install -y sudo && \
     useradd -u $USER_ID -m $USER && \ 
@@ -39,11 +40,11 @@ RUN set -o xtrace \
     wget zip unzip git openssh-client curl bc software-properties-common build-essential \
     ruby-full ruby-bundler libstdc++6 libpulse0 libglu1-mesa locales lcov libsqlite3-dev --no-install-recommends \
     # For Linux build
-    xz-utils \
+    xz-utils acl \
     clang cmake git \
     ninja-build pkg-config \
     libgtk-3-dev liblzma-dev \
-    libstdc++-12-dev \
+    libstdc++-12-dev libsecret-1-dev \
     # for x86 emulators
     libxtst6 libnss3-dev libnspr4 libxss1 libatk-bridge2.0-0 libgtk-3-0 libgdk-pixbuf2.0-0 \
     && sudo rm -rf /var/lib/apt/lists/* \
@@ -66,4 +67,5 @@ RUN set -o xtrace \
     "platforms;android-$ANDROID_PLATFORM_VERSION" \
     "build-tools;$ANDROID_BUILD_TOOLS_VERSION" \
     && yes | sdkmanager "ndk;$ANDROID_NDK_VERSION" \
-    && sudo chown -R $USER:$USER $ANDROID_HOME
+    && sudo chown -R $USER:$USER $ANDROID_HOME \
+    && sudo setfacl -R -m u:$USER:rwX -m d:u:$USER:rwX /usr/local

.docker/build.sh

@@ -22,12 +22,54 @@ else
     PLATFORM_FLAG=""
 fi
 
-docker build $PLATFORM_FLAG -f .docker/android-sdk.dockerfile . -t komodo/android-sdk:35
+HOST_UID=$(id -u)
+HOST_GID=$(id -g)
+
+# Use fallback UID/GID if running as root to avoid conflicts
+# in GitHub Actions where the UID/GID may be 0.
+# android-sdk.dockerfile attempts to create a user with the 
+# provided UID/GID, so 0 is not a valid choice (already exists).
+if [ "$HOST_UID" = "0" ]; then
+    HOST_UID=1000
+    HOST_GID=1000
+fi
+
+docker build $PLATFORM_FLAG --build-arg BUILD_USER_ID=$HOST_UID -f .docker/android-sdk.dockerfile . -t komodo/android-sdk:35
 docker build $PLATFORM_FLAG -f .docker/komodo-wallet-android.dockerfile . -t komodo/komodo-wallet
 
+# Create the build directory ourselves to prevent it from being created by the Docker daemon (as root)
+mkdir -p ./build
+
+COMMIT_HASH=$(git rev-parse --short HEAD | cut -c1-7)
+
+ENV_ARGS=""
+ENV_VARS="GITHUB_API_PUBLIC_READONLY_TOKEN TRELLO_API_KEY \
+TRELLO_TOKEN TRELLO_BOARD_ID TRELLO_LIST_ID \
+FEEDBACK_API_KEY FEEDBACK_PRODUCTION_URL FEEDBACK_TEST_URL \
+COMMIT_HASH"
+
+for VAR in $ENV_VARS; do
+  case "$VAR" in
+    GITHUB_API_PUBLIC_READONLY_TOKEN) VALUE=$GITHUB_API_PUBLIC_READONLY_TOKEN ;;
+    TRELLO_API_KEY) VALUE=$TRELLO_API_KEY ;;
+    TRELLO_TOKEN) VALUE=$TRELLO_TOKEN ;;
+    TRELLO_BOARD_ID) VALUE=$TRELLO_BOARD_ID ;;
+    TRELLO_LIST_ID) VALUE=$TRELLO_LIST_ID ;;
+    FEEDBACK_API_KEY) VALUE=$FEEDBACK_API_KEY ;;
+    FEEDBACK_PRODUCTION_URL) VALUE=$FEEDBACK_PRODUCTION_URL ;;
+    FEEDBACK_TEST_URL) VALUE=$FEEDBACK_TEST_URL ;;
+    COMMIT_HASH) VALUE=$COMMIT_HASH ;;
+    *) VALUE= ;;
+  esac
+
+  [ -n "$VALUE" ] && ENV_ARGS="$ENV_ARGS -e $VAR=$VALUE"
+done
+
 # Use the provided arguments for flutter build
 # Build a second time if needed, as asset downloads will require a rebuild on the first attempt
 docker run $PLATFORM_FLAG --rm -v ./build:/app/build \
-  -u "$(id -u):$(id -g)" \
+  -v $(pwd):/app \
+  -u "$HOST_UID:$HOST_GID" \
+  $ENV_ARGS \
   komodo/komodo-wallet:latest sh -c \
-  "flutter pub get --enforce-lockfile && flutter build $BUILD_TARGET --no-pub --$BUILD_MODE || flutter pub get --enforce-lockfile && flutter build $BUILD_TARGET --no-pub --$BUILD_MODE"
+  "sudo chown -R komodo:komodo /app/build; flutter pub get --enforce-lockfile; flutter build web --no-pub || true; flutter build $BUILD_TARGET --config-only; flutter build $BUILD_TARGET --no-pub --dart-define=COMMIT_HASH=$COMMIT_HASH --$BUILD_MODE"

.docker/komodo-wallet-android.dockerfile

@@ -1,14 +1,13 @@
 FROM komodo/android-sdk:35 AS final
 
-ENV FLUTTER_VERSION="3.29.2"
+ENV FLUTTER_VERSION="3.32.5"
 ENV HOME="/home/komodo"
 ENV USER="komodo"
 ENV PATH=$PATH:$HOME/flutter/bin
 
 USER $USER
 
 WORKDIR /app
-COPY --chown=$USER:$USER . .
 
 RUN curl -O https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz && \
     tar -xvf flutter_linux_${FLUTTER_VERSION}-stable.tar.xz -C ${HOME} && \

.github/actions/flutter-deps/action.yml

@@ -7,7 +7,7 @@ runs:
       uses: subosito/flutter-action@v2
       with:
         # NB! Keep up-to-date with the flutter version used for development
-        flutter-version: "3.29.2"
+        flutter-version: "3.32.5"
         channel: "stable"
 
     - name: Prepare build directory

.github/actions/generate-assets/action.yml

@@ -45,6 +45,22 @@ inputs:
 runs:
   using: "composite"
   steps:
+    - name: Determine commit hash
+      shell: bash
+      run: |
+        echo "Determining commit hash..."
+        if [ "$GITHUB_EVENT_NAME" = "pull_request" ]; then
+          # For PRs, use the HEAD of the feature branch
+          PR_SHA=$(jq -r .pull_request.head.sha "$GITHUB_EVENT_PATH")
+          COMMIT_HASH=${PR_SHA:0:7}
+          echo "Detected pull_request event. Using PR HEAD SHA: $COMMIT_HASH"
+        else
+          # Otherwise use the current checked-out HEAD
+          COMMIT_HASH=$(git rev-parse --short HEAD | cut -c1-7)
+          echo "Using git HEAD SHA: $COMMIT_HASH"
+        fi
+        # Export for subsequent steps
+        echo "COMMIT_HASH=$COMMIT_HASH" >> $GITHUB_ENV
     - name: Fetch packages and generate assets
       shell: bash
       env:
@@ -66,8 +82,7 @@ runs:
           unset GITHUB_API_PUBLIC_READONLY_TOKEN
         fi
 
-        # Get the current commit hash
-        COMMIT_HASH=$(git rev-parse --short HEAD)
+        # Now COMMIT_HASH comes from the previous step, not recalculated here.
 
         # Prepare build command with feedback service credentials
         BUILD_CMD="${{ inputs.BUILD_COMMAND }}"

.github/workflows/docker-android-build.yml

@@ -0,0 +1,49 @@
+name: Build Android Docker image
+
+on:
+  pull_request:
+    branches:
+      [
+        dev,
+        main,
+        release/*,
+        hotfix/*,
+        bugfix/*,
+        feature/*,
+        chore/*,
+        build/*,
+        ci/*,
+      ]
+    paths:
+      - ".docker/**"
+      - "android/**"
+      - "pubspec.yaml"
+      - "pubspec.lock"
+  workflow_dispatch:
+
+jobs:
+  build-android-docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      # Temporary workaround until firebase configs are added to CI
+      - name: Comment out Google Play Services import
+        shell: bash
+        run: |
+          sed -i 's/id .com\.google\.gms\.google-services./\/\/ id .com\.google\.gms\.google-services./' android/app/build.gradle
+          echo "Google Play Services import commented out"
+
+      - name: Build Android image
+        env:
+          GITHUB_API_PUBLIC_READONLY_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          chmod +x .docker/build.sh
+          sh .docker/build.sh apk release

.github/workflows/mobile-builds.yml

@@ -68,6 +68,14 @@ jobs:
           FEEDBACK_PRODUCTION_URL: ${{ secrets.FEEDBACK_PRODUCTION_URL }}
           FEEDBACK_TEST_URL: ${{ secrets.FEEDBACK_TEST_URL }}
 
+      # Flutter build with `--no-pub` flag fails on Android due to a
+      # known regression with the build system in 3.32.5.
+      # https://github.com/flutter/flutter/issues/169336
+      - name: Temporary workaround for Android build issue
+        if: ${{ matrix.platform == 'Android' }}
+        run: |
+          flutter build apk --config-only
+
       - name: Build for ${{ matrix.platform }}
         env:
           GITHUB_API_PUBLIC_READONLY_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/roll-sdk-packages.yml

@@ -45,7 +45,7 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           # NB! Keep up-to-date with the flutter version used for development
-          flutter-version: "3.29.2"
+          flutter-version: "3.32.5"
           channel: "stable"
 
       - name: Determine configuration

.gitignore

@@ -1,5 +1,5 @@
-# First-party
-sdk/
+# Ignore the SDK symmlink (if it exists)
+/sdk/
 
 # Miscellaneous
 *.class
@@ -83,3 +83,4 @@ venv/
 # FVM Version Cache
 .fvm/
 /macos/build
+AGENTS_1.md