ci(distroless): Fix tests (#352)

Fix tests for distroless containers which were always testing the same dart/flutter version.

Author: dnys1

.github/workflows/distroless_dart.yaml

@@ -59,12 +59,6 @@ jobs:
       - name: Git Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
 
-      - name: Setup Flutter
-        uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # 2.19.0
-        with:
-          channel: stable
-          cache: true
-
       # Set up QEMU for multi-platform builds (needed for ARM on x86 runners)
       - name: Set up QEMU
         uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # 3.6.0
@@ -144,8 +138,15 @@ jobs:
           cache-from: type=gha # Pull cache from GitHub Actions cache
           cache-to: type=gha,mode=max # Push cache to GitHub Actions cache (mode=max includes all layers)
 
+      - name: Setup Dart
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c # 1.7.1
+        with:
+          sdk: ${{ matrix.sdk.version }}
+
       - name: Test Container
         working-directory: apps/distroless/dart/test
+        env:
+          DART_VERSION: ${{ matrix.sdk.version }}
         run: |
           dart pub get
           ./test-docker.sh

.github/workflows/distroless_flutter.yaml

@@ -63,12 +63,6 @@ jobs:
       - name: Git Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
 
-      - name: Setup Flutter
-        uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # 2.19.0
-        with:
-          channel: stable
-          cache: true
-
       # Set up Docker Buildx, the builder engine for multi-platform builds
       - name: Set up Docker Buildx
         id: buildx
@@ -166,8 +160,16 @@ jobs:
           cache-from: type=gha # Pull cache from GitHub Actions cache
           cache-to: type=gha,mode=max # Push cache to GitHub Actions cache (mode=max includes all layers)
 
+      - name: Setup Flutter
+        uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # 2.19.0
+        with:
+          channel: ${{ matrix.sdk.channel }}
+          flutter-version: ${{ matrix.sdk.version }}
+
       - name: Test Container
         working-directory: apps/distroless/flutter/test
+        env:
+          FLUTTER_VERSION: ${{ matrix.sdk.version }}
         run: |
           dart pub get
           ./test-docker.sh

apps/cli/fixtures/fixtures_test.dart

@@ -160,6 +160,7 @@ class TestRunner {
           exe: Platform.resolvedExecutable,
           action: PubAction.upgrade,
           workingDirectory: projectRoot,
+          //
           // verbose: Platform.environment.containsKey('CI'),
           verbose: false,
         ).timeout(const Duration(seconds: 30));

apps/distroless/dart/test/test-docker.sh

@@ -3,19 +3,22 @@
 set -e
 
 if [ -n "$FLUTTER_ROOT" ]; then
-  DART_SDK="$FLUTTER_ROOT/bin/cache/dart-sdk"
+  DART_HOME="$FLUTTER_ROOT/bin/cache/dart-sdk"
 fi
-if [ -z "$DART_SDK" ]; then
-  echo "DART_SDK is not set"
+if [ -z "$DART_HOME" ]; then
+  echo "DART_HOME is not set"
   exit 1
 fi
 if [ -z "$DART_VERSION" ]; then
-  DART_VERSION=$(cat $DART_SDK/version)
+  DART_VERSION=$(cat $DART_HOME/version)
 fi
 
-DART="$DART_SDK/bin/dartaotruntime"
-FE_SNAPSHOT="$DART_SDK/bin/snapshots/frontend_server_aot.dart.snapshot"
-VM_PLATFORM="$DART_SDK/lib/_internal/vm_platform_strong_product.dill"
+echo "DART_HOME: $DART_HOME"
+echo "DART_VERSION: $DART_VERSION"
+
+DART="$DART_HOME/bin/dartaotruntime"
+FE_SNAPSHOT="$DART_HOME/bin/snapshots/frontend_server_aot.dart.snapshot"
+VM_PLATFORM="$DART_HOME/lib/_internal/vm_platform_strong_product.dill"
 
 SCRIPT_DIR=$(cd $(dirname $0); pwd)
 
@@ -26,7 +29,7 @@ trap "cd $SCRIPT_DIR" EXIT
 OUT_DIR=$SCRIPT_DIR/out
 
 $DART $FE_SNAPSHOT \
-    --sdk-root $DART_SDK \
+    --sdk-root $DART_HOME \
     --platform $VM_PLATFORM \
     --aot \
     --tfa \

apps/distroless/flutter/test/test-docker.sh

@@ -4,16 +4,17 @@ set -e
 
 if [ -n "$FLUTTER_ROOT" ]; then
   FLUTTER_SDK="$FLUTTER_ROOT"
-  FLUTTER_VERSION=$(cat $FLUTTER_SDK/version)
 fi
 if [ -z "$FLUTTER_VERSION" ]; then
-  echo "FLUTTER_VERSION is not set"
-  echo "Defaulting to 3.29.3"
-  FLUTTER_VERSION=3.29.3
+  FLUTTER_VERSION=$(cat $FLUTTER_SDK/version)
 fi
 
+echo "FLUTTER_SDK: $FLUTTER_SDK"
+echo "FLUTTER_VERSION: $FLUTTER_VERSION"
+
 SCRIPT_DIR=$(cd $(dirname $0); pwd)
 
+rm -rf out/release
 mkdir -p out/release
 cd out/release
 trap "cd $SCRIPT_DIR" EXIT