Merging from dart3a

tekartik · Dec 3, 2023 · 04fe04f · 04fe04f
2 parents 430224e + 9718b7a
commit 04fe04f
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 20 deletions.
diff --git a/.github/workflows/run_ci.yml b/.github/workflows/run_ci.yml
@@ -8,16 +8,24 @@ on:
 
 jobs:
   test:
-    name: Test on ${{ matrix.os }} / ${{ matrix.flutter }}
+    name: Test on ${{ matrix.os }} / flutter ${{ matrix.flutter }}
     runs-on: ${{ matrix.os }}
     defaults:
       run:
         working-directory: ./sqflite_support
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        flutter: [stable, beta]
+        include:
+          - os: ubuntu-latest
+            flutter: stable
+          - os: ubuntu-latest
+            flutter: beta
+          - os: windows-latest
+            flutter: stable
+          - os: macos-latest
+            flutter: stable
+
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4

diff --git a/.github/workflows/run_ci_android.yml b/.github/workflows/run_ci_android.yml
@@ -8,16 +8,20 @@ on:
 
 jobs:
   test:
-    name: Test on ${{ matrix.os }} / ${{ matrix.flutter }}
+    name: Test on ${{ matrix.os }} / flutter ${{ matrix.flutter }}
     runs-on: ${{ matrix.os }}
     defaults:
       run:
         working-directory: ./sqflite_support
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        flutter: [stable, beta]
+        include:
+          - os: ubuntu-latest
+            flutter: stable
+          - os: ubuntu-latest
+            flutter: beta
+
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4

diff --git a/.github/workflows/run_ci_build.yml b/.github/workflows/run_ci_build.yml
@@ -8,16 +8,24 @@ on:
 
 jobs:
   test:
-    name: Test on ${{ matrix.os }} / ${{ matrix.flutter }}
+    name: Test on ${{ matrix.os }} / flutter ${{ matrix.flutter }}
     runs-on: ${{ matrix.os }}
     defaults:
       run:
         working-directory: ./sqflite_support
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        flutter: [stable, beta]
+        include:
+          - os: ubuntu-latest
+            flutter: stable
+          - os: ubuntu-latest
+            flutter: beta
+          - os: windows-latest
+            flutter: stable
+          - os: macos-latest
+            flutter: stable
+
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4

diff --git a/.github/workflows/run_ci_flutter_downgrade_analyze.yml b/.github/workflows/run_ci_flutter_downgrade_analyze.yml
@@ -7,16 +7,18 @@ on:
 
 jobs:
   test:
-    name: Test on ${{ matrix.os }} / ${{ matrix.flutter }}
+    name: Test on ${{ matrix.os }} / flutter ${{ matrix.flutter }}
     runs-on: ${{ matrix.os }}
     defaults:
       run:
         working-directory: .
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        flutter: [stable]
+        include:
+          - os: ubuntu-latest
+            flutter: stable
+
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
@@ -28,5 +30,5 @@ jobs:
           channel: ${{ matrix.flutter }}
       - run: dart --version
       - run: flutter --version
-      - run: dart pub global activate dev_test
-      - run: dart pub global run dev_test:run_ci --pub-downgrade --analyze --no-override --recursive
+      - run: dart pub global activate dev_build
+      - run: dart pub global run dev_build:run_ci --pub-downgrade --analyze --no-override --recursive
diff --git a/.github/workflows/run_ci_macos.yml b/.github/workflows/run_ci_macos.yml
@@ -8,16 +8,18 @@ on:
 
 jobs:
   test:
-    name: Test on ${{ matrix.os }} / ${{ matrix.flutter }}
+    name: Test on ${{ matrix.os }} / flutter ${{ matrix.flutter }}
     runs-on: ${{ matrix.os }}
     defaults:
       run:
         working-directory: ./sqflite_support
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest]
-        flutter: [stable]
+        include:
+          - os: macos-latest
+            flutter: stable
+
     steps:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2

diff --git a/.github/workflows/run_ci_web.yml b/.github/workflows/run_ci_web.yml
@@ -8,16 +8,28 @@ on:
 
 jobs:
   test:
-    name: Test on ${{ matrix.os }} / ${{ matrix.dart }}
+    name: Test on ${{ matrix.os }} / dart ${{ matrix.dart }}
     runs-on: ${{ matrix.os }}
     defaults:
       run:
         working-directory: ./sqflite_support
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        dart: [3.1.5, stable, beta, dev]
+        include:
+          - os: ubuntu-latest
+            dart: 3.1.5
+          - os: ubuntu-latest
+            dart: stable
+          - os: ubuntu-latest
+            dart: beta
+          - os: ubuntu-latest
+            dart: dev
+          - os: windows-latest
+            dart: stable
+          - os: macos-latest
+            dart: stable
+
     steps:
       - uses: actions/checkout@v4
       - uses: dart-lang/[email protected]