Update CI settings to run on current branch

Anna Gringauze · Anna Gringauze · commit 1ddc71037757 · 2022-04-06T17:34:37.000-07:00
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
diff --git a/dwds/mono_pkg.yaml b/dwds/mono_pkg.yaml
@@ -5,30 +5,18 @@ stages:
       - format
       - analyze: --fatal-infos .
       - test: test/build/ensure_version_test.dart
-      dart: dev
+      sdk: stable
     - group:
       - analyze: .
-      - test: test/build/min_sdk_test.dart --run-skipped
-      dart: stable
+      sdk: stable
   - unit_test:
     - group:
       - command: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
       - test:
-      dart:
-        - dev
+      sdk:
         - stable
     - test:
       os: windows
-      dart:
-        - dev
+      sdk:
         - stable
-  - beta_cron:
-    - analyze: .
-      dart: beta
-    - group:
-      - command: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-      - test: -j 1
-      dart: beta
-    - test: -j 1
-      os: windows
-      dart: beta
+  
diff --git a/example/mono_pkg.yaml b/example/mono_pkg.yaml
@@ -4,7 +4,7 @@ stages:
     - group:
       - format
       - analyze: --fatal-infos .
-      dart: dev
+      sdk: stable
 
 cache:
   directories:
diff --git a/fixtures/_webdevSmoke/mono_pkg.yaml b/fixtures/_webdevSmoke/mono_pkg.yaml
@@ -4,7 +4,7 @@ stages:
     - group:
       - format
       - analyze: --fatal-infos .
-      dart: dev
+      sdk: stable
 
 cache:
   directories:
diff --git a/frontend_server_client/mono_pkg.yaml b/frontend_server_client/mono_pkg.yaml
@@ -4,12 +4,11 @@ stages:
     - group:
       - format
       - analyze: --fatal-infos .
-      dart: dev
+      sdk: stable
   - unit_test:
     - test:
-      dart:
+      sdk:
         - stable
-        - dev
       os:
         - windows
         - linux
diff --git a/frontend_server_common/mono_pkg.yaml b/frontend_server_common/mono_pkg.yaml
@@ -4,4 +4,4 @@ stages:
     - group:
       - format
       - analyze: --fatal-infos .
-      dart: dev
+      sdk: stable
diff --git a/mono_repo.yaml b/mono_repo.yaml
@@ -1,9 +1,13 @@
 # See https://pub.dev/packages/mono_repo for details
 self_validate: analyzer_and_format
 github:
+  on:
+    push:
+      branches:
+        - dwds-v11.5.2
+    pull_request:
   env:
     DISPLAY: ':99'
-  cron: '0 0 * * 0' # "At 00:00 (UTC) on Sunday."
   on_completion:
     - name: "Notify failure"
       runs-on: ubuntu-latest
@@ -16,10 +20,6 @@ github:
               "${CHAT_WEBHOOK_URL}"
           env:
             CHAT_WEBHOOK_URL: ${{ secrets.BUILD_AND_TEST_TEAM_CHAT_WEBHOOK_URL }}
-  stages:
-      - name: beta_cron
-        # Only run this stage for scheduled cron jobs
-        if: github.event_name == 'schedule'
 
 merge_stages:
 - analyzer_and_format
diff --git a/tool/ci.sh b/tool/ci.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Created with package:mono_repo v5.0.4
+# Created with package:mono_repo v6.2.0
 
 # Support built in commands on windows out of the box.
 # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter")
@@ -88,21 +88,17 @@ for PKG in ${PKGS}; do
         dart test test/build/ensure_version_test.dart || EXIT_CODE=$?
         ;;
       test_1)
-        echo 'dart test test/build/min_sdk_test.dart --run-skipped'
-        dart test test/build/min_sdk_test.dart --run-skipped || EXIT_CODE=$?
-        ;;
-      test_2)
         echo 'dart test'
         dart test || EXIT_CODE=$?
         ;;
+      test_2)
+        echo 'dart test test/build/ensure_build_test.dart'
+        dart test test/build/ensure_build_test.dart || EXIT_CODE=$?
+        ;;
       test_3)
         echo 'dart test -j 1'
         dart test -j 1 || EXIT_CODE=$?
         ;;
-      test_4)
-        echo 'dart test test/build/ensure_build_test.dart'
-        dart test test/build/ensure_build_test.dart || EXIT_CODE=$?
-        ;;
       *)
         echo -e "\033[31mUnknown TASK '${TASK}' - TERMINATING JOB\033[0m"
         exit 64
diff --git a/webdev/mono_pkg.yaml b/webdev/mono_pkg.yaml
@@ -5,30 +5,18 @@ stages:
       - format
       - analyze: --fatal-infos .
       - test: test/build/ensure_build_test.dart
-      dart: dev
+      sdk: stable
     - group:
       - analyze: .
-      - test: test/build/min_sdk_test.dart --run-skipped
-      dart: stable
+      sdk: stable
   - unit_test:
     - group:
       - command: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
       - test: -j 1
-      dart:
-        - dev
+      sdk:
         - stable
     - test: -j 1
       os: windows
-      dart:
-        - dev
+      sdk:
         - stable
-  - beta_cron:
-    - analyze: .
-      dart: beta
-    - group:
-      - command: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-      - test: -j 1
-      dart: beta
-    - test: -j 1
-      os: windows
-      dart: beta
+
