From c77ed473e8b4964b056dc2450ecc5033d785b873 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Tue, 3 Sep 2024 22:31:06 +0000 Subject: [PATCH 01/21] Add support for multiple full paths on macos We cannot look up multiple basename commands in the system path and the current `macOsExecutable` configuration may have existing uses in `dart_test.yaml` files so it isn't safe to require full paths. Add a separate `macOsAbsolutePaths` configuration to enable internal definitions that check multiple full paths and execute the first one that exists. There is no support here for `dart_test.yaml`. Users that are configuring an executable for macOS will continue to have support for only a single value, even if they are specifying an absolute path. --- .../src/runner/browser/default_settings.dart | 5 +++- .../lib/src/runner/executable_settings.dart | 25 ++++++++++++++++--- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/pkgs/test/lib/src/runner/browser/default_settings.dart b/pkgs/test/lib/src/runner/browser/default_settings.dart index b2b24d3ce..75904e1ea 100644 --- a/pkgs/test/lib/src/runner/browser/default_settings.dart +++ b/pkgs/test/lib/src/runner/browser/default_settings.dart @@ -24,7 +24,10 @@ final defaultSettings = UnmodifiableMapView({ ), Runtime.firefox: ExecutableSettings( linuxExecutable: 'firefox', - macOSExecutable: '/Applications/Firefox.app/Contents/MacOS/firefox-bin', + macOsAbsolutePaths: { + '/Applications/Firefox.app/Contents/MacOS/firefox-bin', + '/Applications/Firefox.app/Contents/MacOS/firefox' + }, windowsExecutable: r'Mozilla Firefox\firefox.exe', environmentOverride: 'FIREFOX_EXECUTABLE'), Runtime.safari: ExecutableSettings( diff --git a/pkgs/test/lib/src/runner/executable_settings.dart b/pkgs/test/lib/src/runner/executable_settings.dart index cd67b9352..85078734a 100644 --- a/pkgs/test/lib/src/runner/executable_settings.dart +++ b/pkgs/test/lib/src/runner/executable_settings.dart @@ -20,12 +20,19 @@ class ExecutableSettings { /// looked up on the system path. It may not be relative. final String? _linuxExecutable; - /// The path to the executable on Mac OS. + /// The command to execute on Mac OS. /// - /// This may be an absolute path or a basename, in which case it will be - /// looked up on the system path. It may not be relative. + /// This may be a basename or an absolute path. + /// If this is a basename it is resolved by the OS on the system path. + /// Otherwise, the path must be absolute, not relative. final String? _macOSExecutable; + /// Potential absolute paths to the executable on Mac OS. + /// + /// When multiple paths are provided the first to exist on the filesystem is + /// chosen. Paths must be absolute. + final Set? _macOSAbsolutePaths; + /// The path to the executable on Windows. /// /// This may be an absolute path; a basename, in which case it will be looked @@ -45,7 +52,14 @@ class ExecutableSettings { if (envVariable != null) return envVariable; } - if (Platform.isMacOS) return _macOSExecutable!; + if (Platform.isMacOS) { + if (_macOSAbsolutePaths case final paths?) { + for (final path in paths) { + if (File(path).existsSync()) return path; + } + } + return (_macOSExecutable ?? _macOSAbsolutePaths?.first)!; + } if (!Platform.isWindows) return _linuxExecutable!; final windowsExecutable = _windowsExecutable!; if (p.isAbsolute(windowsExecutable)) return windowsExecutable; @@ -177,12 +191,14 @@ class ExecutableSettings { {Iterable? arguments, String? linuxExecutable, String? macOSExecutable, + Set? macOsAbsolutePaths, String? windowsExecutable, String? environmentOverride, bool? headless}) : arguments = arguments == null ? const [] : List.unmodifiable(arguments), _linuxExecutable = linuxExecutable, _macOSExecutable = macOSExecutable, + _macOSAbsolutePaths = macOsAbsolutePaths, _windowsExecutable = windowsExecutable, _environmentOverride = environmentOverride, _headless = headless; @@ -193,5 +209,6 @@ class ExecutableSettings { headless: other._headless ?? _headless, linuxExecutable: other._linuxExecutable ?? _linuxExecutable, macOSExecutable: other._macOSExecutable ?? _macOSExecutable, + macOsAbsolutePaths: other._macOSAbsolutePaths ?? _macOSAbsolutePaths, windowsExecutable: other._windowsExecutable ?? _windowsExecutable); } From 00d03e7c4fc7ae6624f8ac11fbc91af997da9baf Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Tue, 3 Sep 2024 22:37:33 +0000 Subject: [PATCH 02/21] Changelog --- pkgs/test/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/test/CHANGELOG.md b/pkgs/test/CHANGELOG.md index cc228ade6..04ef333c1 100644 --- a/pkgs/test/CHANGELOG.md +++ b/pkgs/test/CHANGELOG.md @@ -3,6 +3,7 @@ * Fix dart2wasm tests on windows. * Increase SDK constraint to ^3.5.0-311.0.dev. * Support running Node.js tests compiled with dart2wasm. +* Allow `firefox` or `firefox-bin` executable name on macOS. ## 1.25.8 From 76ac3228a107fc5beadac9f74800a3c761674094 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Tue, 3 Sep 2024 23:07:28 +0000 Subject: [PATCH 03/21] Normalize during construction fixes merge behavior to correctly override. --- .../src/runner/browser/default_settings.dart | 4 +- .../lib/src/runner/executable_settings.dart | 41 ++++++++++--------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/pkgs/test/lib/src/runner/browser/default_settings.dart b/pkgs/test/lib/src/runner/browser/default_settings.dart index 75904e1ea..fadab0e21 100644 --- a/pkgs/test/lib/src/runner/browser/default_settings.dart +++ b/pkgs/test/lib/src/runner/browser/default_settings.dart @@ -24,10 +24,10 @@ final defaultSettings = UnmodifiableMapView({ ), Runtime.firefox: ExecutableSettings( linuxExecutable: 'firefox', - macOsAbsolutePaths: { + macOSExecutables: [ '/Applications/Firefox.app/Contents/MacOS/firefox-bin', '/Applications/Firefox.app/Contents/MacOS/firefox' - }, + ], windowsExecutable: r'Mozilla Firefox\firefox.exe', environmentOverride: 'FIREFOX_EXECUTABLE'), Runtime.safari: ExecutableSettings( diff --git a/pkgs/test/lib/src/runner/executable_settings.dart b/pkgs/test/lib/src/runner/executable_settings.dart index 85078734a..2ae80ab55 100644 --- a/pkgs/test/lib/src/runner/executable_settings.dart +++ b/pkgs/test/lib/src/runner/executable_settings.dart @@ -20,18 +20,14 @@ class ExecutableSettings { /// looked up on the system path. It may not be relative. final String? _linuxExecutable; - /// The command to execute on Mac OS. + /// Potential commands to execute on Mac OS. /// - /// This may be a basename or an absolute path. - /// If this is a basename it is resolved by the OS on the system path. - /// Otherwise, the path must be absolute, not relative. - final String? _macOSExecutable; - - /// Potential absolute paths to the executable on Mac OS. - /// - /// When multiple paths are provided the first to exist on the filesystem is - /// chosen. Paths must be absolute. - final Set? _macOSAbsolutePaths; + /// The values may be an absolute path, or a basename. + /// The chosen command will be the first value from this list which either is + /// a full path that exists, or is a basename. When a basename is included it + /// should always be at the end of the list because it will always terminate + /// the search through the list. Relative paths are not allowed. + final List? _macOSExectuables; /// The path to the executable on Windows. /// @@ -53,12 +49,13 @@ class ExecutableSettings { } if (Platform.isMacOS) { - if (_macOSAbsolutePaths case final paths?) { + if (_macOSExectuables case final paths?) { for (final path in paths) { - if (File(path).existsSync()) return path; + if (p.basename(path) == path) return path; + if (p.isAbsolute(path) && File(path).existsSync()) return path; } } - return (_macOSExecutable ?? _macOSAbsolutePaths?.first)!; + throw ArgumentError('Missing macOsExecutable'); } if (!Platform.isWindows) return _linuxExecutable!; final windowsExecutable = _windowsExecutable!; @@ -191,14 +188,14 @@ class ExecutableSettings { {Iterable? arguments, String? linuxExecutable, String? macOSExecutable, - Set? macOsAbsolutePaths, + List? macOSExecutables, String? windowsExecutable, String? environmentOverride, bool? headless}) : arguments = arguments == null ? const [] : List.unmodifiable(arguments), _linuxExecutable = linuxExecutable, - _macOSExecutable = macOSExecutable, - _macOSAbsolutePaths = macOsAbsolutePaths, + _macOSExectuables = + _normalizeMacExecutable(macOSExecutable, macOSExecutables), _windowsExecutable = windowsExecutable, _environmentOverride = environmentOverride, _headless = headless; @@ -208,7 +205,13 @@ class ExecutableSettings { arguments: arguments.toList()..addAll(other.arguments), headless: other._headless ?? _headless, linuxExecutable: other._linuxExecutable ?? _linuxExecutable, - macOSExecutable: other._macOSExecutable ?? _macOSExecutable, - macOsAbsolutePaths: other._macOSAbsolutePaths ?? _macOSAbsolutePaths, + macOSExecutables: other._macOSExectuables ?? _macOSExectuables, windowsExecutable: other._windowsExecutable ?? _windowsExecutable); } + +List? _normalizeMacExecutable( + String? singleArgument, List? listArgument) { + if (listArgument != null) return listArgument; + if (singleArgument != null) return [singleArgument]; + return null; +} From d119016b1d62a7817b2e4f2faae401f994fa76e2 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Thu, 5 Sep 2024 13:34:08 -0700 Subject: [PATCH 04/21] Use private field promotion Co-authored-by: Jacob MacDonald --- pkgs/test/lib/src/runner/executable_settings.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/test/lib/src/runner/executable_settings.dart b/pkgs/test/lib/src/runner/executable_settings.dart index 2ae80ab55..182b1a5c8 100644 --- a/pkgs/test/lib/src/runner/executable_settings.dart +++ b/pkgs/test/lib/src/runner/executable_settings.dart @@ -49,8 +49,8 @@ class ExecutableSettings { } if (Platform.isMacOS) { - if (_macOSExectuables case final paths?) { - for (final path in paths) { + if (_macOSExectuables != null) { + for (final path in _macOSExectuables) { if (p.basename(path) == path) return path; if (p.isAbsolute(path) && File(path).existsSync()) return path; } From c01757da1350b9c9ff2b85dd18436f0d2836079e Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Thu, 5 Sep 2024 13:35:05 -0700 Subject: [PATCH 05/21] Update pkgs/test/lib/src/runner/executable_settings.dart Co-authored-by: Jacob MacDonald --- pkgs/test/lib/src/runner/executable_settings.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/lib/src/runner/executable_settings.dart b/pkgs/test/lib/src/runner/executable_settings.dart index 182b1a5c8..2eb282b59 100644 --- a/pkgs/test/lib/src/runner/executable_settings.dart +++ b/pkgs/test/lib/src/runner/executable_settings.dart @@ -20,7 +20,7 @@ class ExecutableSettings { /// looked up on the system path. It may not be relative. final String? _linuxExecutable; - /// Potential commands to execute on Mac OS. + /// Potential commands to execute on Mac OS to launch this executable. /// /// The values may be an absolute path, or a basename. /// The chosen command will be the first value from this list which either is From ec4029f928beff253981e24b14203b76f2bf64e3 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Wed, 11 Sep 2024 21:12:51 +0000 Subject: [PATCH 06/21] Unskip firefox tests on mac --- pkgs/test/test/runner/compiler_runtime_matrix_test.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/test/test/runner/compiler_runtime_matrix_test.dart b/pkgs/test/test/runner/compiler_runtime_matrix_test.dart index 74d880239..059222247 100644 --- a/pkgs/test/test/runner/compiler_runtime_matrix_test.dart +++ b/pkgs/test/test/runner/compiler_runtime_matrix_test.dart @@ -34,8 +34,6 @@ void main() { } else if ([Runtime.firefox, Runtime.nodeJS].contains(runtime) && Platform.isWindows) { skipReason = 'https://github.com/dart-lang/test/issues/1942'; - } else if (runtime == Runtime.firefox && Platform.isMacOS) { - skipReason = 'https://github.com/dart-lang/test/pull/2276'; } group('--runtime ${runtime.identifier} --compiler ${compiler.identifier}', skip: skipReason, () { From dcced6f4bb043121d7cd9a45cfbcb80353a05d6e Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Wed, 11 Sep 2024 22:37:28 +0000 Subject: [PATCH 07/21] Add firefox setup on osx --- .github/workflows/dart.yml | 61 ++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index d0db67731..2d1879dd4 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -16,29 +16,29 @@ env: permissions: read-all jobs: - job_001: - name: mono_repo self validate - runs-on: ubuntu-latest - steps: - - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 - with: - path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" - restore-keys: | - os:ubuntu-latest;pub-cache-hosted - os:ubuntu-latest - - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 - with: - sdk: stable - - id: checkout - name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - - name: mono_repo self validate - run: dart pub global activate mono_repo 6.6.2 - - name: mono_repo self validate - run: dart pub global run mono_repo generate --validate + # job_001: + # name: mono_repo self validate + # runs-on: ubuntu-latest + # steps: + # - name: Cache Pub hosted dependencies + # uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + # with: + # path: "~/.pub-cache/hosted" + # key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" + # restore-keys: | + # os:ubuntu-latest;pub-cache-hosted + # os:ubuntu-latest + # - name: Setup Dart SDK + # uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + # with: + # sdk: stable + # - id: checkout + # name: Checkout repository + # uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + # - name: mono_repo self validate + # run: dart pub global activate mono_repo 6.6.2 + # - name: mono_repo self validate + # run: dart pub global run mono_repo generate --validate job_002: name: "analyze_and_format; linux; Dart 3.5.0-311.0.dev; PKGS: integration_tests/regression, integration_tests/wasm; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`" runs-on: ubuntu-latest @@ -1113,6 +1113,9 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest + - name: Setup firefox + id: setup-firefox + uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1150,6 +1153,9 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest + - name: Setup firefox + id: setup-firefox + uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1187,6 +1193,9 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest + - name: Setup firefox + id: setup-firefox + uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1224,6 +1233,9 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest + - name: Setup firefox + id: setup-firefox + uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1261,6 +1273,9 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest + - name: Setup firefox + id: setup-firefox + uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: From 73e1432b499f1ddf4d73838c5a290e7589c6794a Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Wed, 11 Sep 2024 22:51:30 +0000 Subject: [PATCH 08/21] Remove references to removed mono repo validation job --- .github/workflows/dart.yml | 74 +++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 2d1879dd4..cc4b53af3 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -316,7 +316,7 @@ jobs: if: "always() && steps.integration_tests_regression_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/regression needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -353,7 +353,7 @@ jobs: if: "always() && steps.pkgs_checks_pub_upgrade.conclusion == 'success'" working-directory: pkgs/checks needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -390,7 +390,7 @@ jobs: if: "always() && steps.pkgs_test_core_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_core needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -427,7 +427,7 @@ jobs: if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/spawn_hybrid needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -464,7 +464,7 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -501,7 +501,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -538,7 +538,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -575,7 +575,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -612,7 +612,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -649,7 +649,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -686,7 +686,7 @@ jobs: if: "always() && steps.pkgs_test_api_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_api needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -723,7 +723,7 @@ jobs: if: "always() && steps.integration_tests_regression_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/regression needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -760,7 +760,7 @@ jobs: if: "always() && steps.pkgs_checks_pub_upgrade.conclusion == 'success'" working-directory: pkgs/checks needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -797,7 +797,7 @@ jobs: if: "always() && steps.pkgs_test_core_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_core needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -834,7 +834,7 @@ jobs: if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/spawn_hybrid needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -871,7 +871,7 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -908,7 +908,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -945,7 +945,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -982,7 +982,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1019,7 +1019,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1056,7 +1056,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1093,7 +1093,7 @@ jobs: if: "always() && steps.pkgs_test_api_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_api needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1133,7 +1133,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1173,7 +1173,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1213,7 +1213,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1253,7 +1253,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1293,7 +1293,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1320,7 +1320,7 @@ jobs: if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/spawn_hybrid needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1347,7 +1347,7 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1374,7 +1374,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1401,7 +1401,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1428,7 +1428,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1455,7 +1455,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1482,7 +1482,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1509,7 +1509,7 @@ jobs: if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/spawn_hybrid needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1536,7 +1536,7 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1554,7 +1554,7 @@ jobs: env: CHAT_WEBHOOK_URL: "${{ secrets.BUILD_AND_TEST_TEAM_CHAT_WEBHOOK_URL }}" needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 From 03db40bb29c5568b97bbf05dfff7e10b87a55253 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Wed, 11 Sep 2024 23:17:27 +0000 Subject: [PATCH 09/21] Add some printf debugging --- pkgs/test/lib/src/runner/executable_settings.dart | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/test/lib/src/runner/executable_settings.dart b/pkgs/test/lib/src/runner/executable_settings.dart index 2eb282b59..55a8cf13e 100644 --- a/pkgs/test/lib/src/runner/executable_settings.dart +++ b/pkgs/test/lib/src/runner/executable_settings.dart @@ -52,10 +52,18 @@ class ExecutableSettings { if (_macOSExectuables != null) { for (final path in _macOSExectuables) { if (p.basename(path) == path) return path; - if (p.isAbsolute(path) && File(path).existsSync()) return path; + if (p.isAbsolute(path)) { + if (File(path).existsSync()) return path; + print('Non-existent absolute path: $path'); + } else { + throw ArgumentError( + 'Mac OS executable must be a basename or an absolute path.' + ' Got relative path: $path'); + } } } - throw ArgumentError('Missing macOsExecutable'); + throw ArgumentError('Could not find an existing macOS executable in' + '$_macOSExectuables'); } if (!Platform.isWindows) return _linuxExecutable!; final windowsExecutable = _windowsExecutable!; From 00615547b303f367bfd64d08c0814f1369aa910f Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Wed, 11 Sep 2024 23:18:14 +0000 Subject: [PATCH 10/21] Revert workflow changes --- .github/workflows/dart.yml | 135 +++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 75 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index cc4b53af3..d0db67731 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -16,29 +16,29 @@ env: permissions: read-all jobs: - # job_001: - # name: mono_repo self validate - # runs-on: ubuntu-latest - # steps: - # - name: Cache Pub hosted dependencies - # uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 - # with: - # path: "~/.pub-cache/hosted" - # key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" - # restore-keys: | - # os:ubuntu-latest;pub-cache-hosted - # os:ubuntu-latest - # - name: Setup Dart SDK - # uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 - # with: - # sdk: stable - # - id: checkout - # name: Checkout repository - # uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - # - name: mono_repo self validate - # run: dart pub global activate mono_repo 6.6.2 - # - name: mono_repo self validate - # run: dart pub global run mono_repo generate --validate + job_001: + name: mono_repo self validate + runs-on: ubuntu-latest + steps: + - name: Cache Pub hosted dependencies + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - name: Setup Dart SDK + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + with: + sdk: stable + - id: checkout + name: Checkout repository + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - name: mono_repo self validate + run: dart pub global activate mono_repo 6.6.2 + - name: mono_repo self validate + run: dart pub global run mono_repo generate --validate job_002: name: "analyze_and_format; linux; Dart 3.5.0-311.0.dev; PKGS: integration_tests/regression, integration_tests/wasm; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`" runs-on: ubuntu-latest @@ -316,7 +316,7 @@ jobs: if: "always() && steps.integration_tests_regression_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/regression needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -353,7 +353,7 @@ jobs: if: "always() && steps.pkgs_checks_pub_upgrade.conclusion == 'success'" working-directory: pkgs/checks needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -390,7 +390,7 @@ jobs: if: "always() && steps.pkgs_test_core_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_core needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -427,7 +427,7 @@ jobs: if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/spawn_hybrid needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -464,7 +464,7 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -501,7 +501,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -538,7 +538,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -575,7 +575,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -612,7 +612,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -649,7 +649,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -686,7 +686,7 @@ jobs: if: "always() && steps.pkgs_test_api_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_api needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -723,7 +723,7 @@ jobs: if: "always() && steps.integration_tests_regression_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/regression needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -760,7 +760,7 @@ jobs: if: "always() && steps.pkgs_checks_pub_upgrade.conclusion == 'success'" working-directory: pkgs/checks needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -797,7 +797,7 @@ jobs: if: "always() && steps.pkgs_test_core_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_core needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -834,7 +834,7 @@ jobs: if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/spawn_hybrid needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -871,7 +871,7 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -908,7 +908,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -945,7 +945,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -982,7 +982,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1019,7 +1019,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1056,7 +1056,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1093,7 +1093,7 @@ jobs: if: "always() && steps.pkgs_test_api_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_api needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1113,9 +1113,6 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest - - name: Setup firefox - id: setup-firefox - uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1133,7 +1130,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1153,9 +1150,6 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest - - name: Setup firefox - id: setup-firefox - uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1173,7 +1167,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1193,9 +1187,6 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest - - name: Setup firefox - id: setup-firefox - uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1213,7 +1204,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1233,9 +1224,6 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest - - name: Setup firefox - id: setup-firefox - uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1253,7 +1241,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1273,9 +1261,6 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest - - name: Setup firefox - id: setup-firefox - uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1293,7 +1278,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1320,7 +1305,7 @@ jobs: if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/spawn_hybrid needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1347,7 +1332,7 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1374,7 +1359,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1401,7 +1386,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1428,7 +1413,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1455,7 +1440,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1482,7 +1467,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1509,7 +1494,7 @@ jobs: if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/spawn_hybrid needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1536,7 +1521,7 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1554,7 +1539,7 @@ jobs: env: CHAT_WEBHOOK_URL: "${{ secrets.BUILD_AND_TEST_TEAM_CHAT_WEBHOOK_URL }}" needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 From 6fc69b6302b5a16cfb7533e0c1e10c7a3fe22043 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Thu, 12 Sep 2024 21:25:55 +0000 Subject: [PATCH 11/21] Add a basename firefox as a fallback Does Github Actions have it on the path? --- pkgs/test/lib/src/runner/browser/default_settings.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/test/lib/src/runner/browser/default_settings.dart b/pkgs/test/lib/src/runner/browser/default_settings.dart index fadab0e21..312fc1130 100644 --- a/pkgs/test/lib/src/runner/browser/default_settings.dart +++ b/pkgs/test/lib/src/runner/browser/default_settings.dart @@ -26,7 +26,8 @@ final defaultSettings = UnmodifiableMapView({ linuxExecutable: 'firefox', macOSExecutables: [ '/Applications/Firefox.app/Contents/MacOS/firefox-bin', - '/Applications/Firefox.app/Contents/MacOS/firefox' + '/Applications/Firefox.app/Contents/MacOS/firefox', + 'firefox', ], windowsExecutable: r'Mozilla Firefox\firefox.exe', environmentOverride: 'FIREFOX_EXECUTABLE'), From 34f5df000e76683d8178d97eee85982ce6b8b3c4 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Thu, 12 Sep 2024 23:27:49 +0000 Subject: [PATCH 12/21] Desperate printf debugging - List all applications --- pkgs/test/lib/src/runner/browser/default_settings.dart | 1 - pkgs/test/lib/src/runner/browser/firefox.dart | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/test/lib/src/runner/browser/default_settings.dart b/pkgs/test/lib/src/runner/browser/default_settings.dart index 312fc1130..d855ef6bd 100644 --- a/pkgs/test/lib/src/runner/browser/default_settings.dart +++ b/pkgs/test/lib/src/runner/browser/default_settings.dart @@ -27,7 +27,6 @@ final defaultSettings = UnmodifiableMapView({ macOSExecutables: [ '/Applications/Firefox.app/Contents/MacOS/firefox-bin', '/Applications/Firefox.app/Contents/MacOS/firefox', - 'firefox', ], windowsExecutable: r'Mozilla Firefox\firefox.exe', environmentOverride: 'FIREFOX_EXECUTABLE'), diff --git a/pkgs/test/lib/src/runner/browser/firefox.dart b/pkgs/test/lib/src/runner/browser/firefox.dart index 503f103c0..02036786b 100644 --- a/pkgs/test/lib/src/runner/browser/firefox.dart +++ b/pkgs/test/lib/src/runner/browser/firefox.dart @@ -41,6 +41,10 @@ class Firefox extends Browser { var dir = createTempDir(); File(p.join(dir, 'prefs.js')).writeAsStringSync(_preferences); + for (final file in Directory('/Applications/').listSync()) { + print(file.path); + } + var process = await Process.start(settings.executable, [ '--profile', dir, From 0d62e19f09c7ff6cb257ee1c06090a962e2eab3c Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Thu, 12 Sep 2024 23:39:45 +0000 Subject: [PATCH 13/21] Maybe there is an applications directory in ~? --- pkgs/test/lib/src/runner/browser/default_settings.dart | 4 +++- pkgs/test/lib/src/runner/browser/firefox.dart | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/test/lib/src/runner/browser/default_settings.dart b/pkgs/test/lib/src/runner/browser/default_settings.dart index d855ef6bd..3b3f367d4 100644 --- a/pkgs/test/lib/src/runner/browser/default_settings.dart +++ b/pkgs/test/lib/src/runner/browser/default_settings.dart @@ -26,7 +26,9 @@ final defaultSettings = UnmodifiableMapView({ linuxExecutable: 'firefox', macOSExecutables: [ '/Applications/Firefox.app/Contents/MacOS/firefox-bin', - '/Applications/Firefox.app/Contents/MacOS/firefox', + '/Applications/Firefox.app/Contents/MacOS/firefox-bin', + '~/Applications/Firefox.app/Contents/MacOS/firefox', + '~/Applications/Firefox.app/Contents/MacOS/firefox', ], windowsExecutable: r'Mozilla Firefox\firefox.exe', environmentOverride: 'FIREFOX_EXECUTABLE'), diff --git a/pkgs/test/lib/src/runner/browser/firefox.dart b/pkgs/test/lib/src/runner/browser/firefox.dart index 02036786b..f3fd5b161 100644 --- a/pkgs/test/lib/src/runner/browser/firefox.dart +++ b/pkgs/test/lib/src/runner/browser/firefox.dart @@ -44,6 +44,9 @@ class Firefox extends Browser { for (final file in Directory('/Applications/').listSync()) { print(file.path); } + for (final file in Directory('~').listSync()) { + print(file.path); + } var process = await Process.start(settings.executable, [ '--profile', From 6d3366141a2a1bdc5522a830d358ad8fa47448e2 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Thu, 12 Sep 2024 23:46:19 +0000 Subject: [PATCH 14/21] Try setup-firefox again with more log output --- .github/workflows/dart.yml | 135 ++++++++++++++++++++----------------- 1 file changed, 75 insertions(+), 60 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index d0db67731..cc4b53af3 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -16,29 +16,29 @@ env: permissions: read-all jobs: - job_001: - name: mono_repo self validate - runs-on: ubuntu-latest - steps: - - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 - with: - path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" - restore-keys: | - os:ubuntu-latest;pub-cache-hosted - os:ubuntu-latest - - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 - with: - sdk: stable - - id: checkout - name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - - name: mono_repo self validate - run: dart pub global activate mono_repo 6.6.2 - - name: mono_repo self validate - run: dart pub global run mono_repo generate --validate + # job_001: + # name: mono_repo self validate + # runs-on: ubuntu-latest + # steps: + # - name: Cache Pub hosted dependencies + # uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + # with: + # path: "~/.pub-cache/hosted" + # key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" + # restore-keys: | + # os:ubuntu-latest;pub-cache-hosted + # os:ubuntu-latest + # - name: Setup Dart SDK + # uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + # with: + # sdk: stable + # - id: checkout + # name: Checkout repository + # uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + # - name: mono_repo self validate + # run: dart pub global activate mono_repo 6.6.2 + # - name: mono_repo self validate + # run: dart pub global run mono_repo generate --validate job_002: name: "analyze_and_format; linux; Dart 3.5.0-311.0.dev; PKGS: integration_tests/regression, integration_tests/wasm; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`" runs-on: ubuntu-latest @@ -316,7 +316,7 @@ jobs: if: "always() && steps.integration_tests_regression_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/regression needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -353,7 +353,7 @@ jobs: if: "always() && steps.pkgs_checks_pub_upgrade.conclusion == 'success'" working-directory: pkgs/checks needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -390,7 +390,7 @@ jobs: if: "always() && steps.pkgs_test_core_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_core needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -427,7 +427,7 @@ jobs: if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/spawn_hybrid needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -464,7 +464,7 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -501,7 +501,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -538,7 +538,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -575,7 +575,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -612,7 +612,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -649,7 +649,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -686,7 +686,7 @@ jobs: if: "always() && steps.pkgs_test_api_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_api needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -723,7 +723,7 @@ jobs: if: "always() && steps.integration_tests_regression_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/regression needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -760,7 +760,7 @@ jobs: if: "always() && steps.pkgs_checks_pub_upgrade.conclusion == 'success'" working-directory: pkgs/checks needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -797,7 +797,7 @@ jobs: if: "always() && steps.pkgs_test_core_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_core needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -834,7 +834,7 @@ jobs: if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/spawn_hybrid needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -871,7 +871,7 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -908,7 +908,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -945,7 +945,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -982,7 +982,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1019,7 +1019,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1056,7 +1056,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1093,7 +1093,7 @@ jobs: if: "always() && steps.pkgs_test_api_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_api needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1113,6 +1113,9 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest + - name: Setup firefox + id: setup-firefox + uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1130,7 +1133,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1150,6 +1153,9 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest + - name: Setup firefox + id: setup-firefox + uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1167,7 +1173,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1187,6 +1193,9 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest + - name: Setup firefox + id: setup-firefox + uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1204,7 +1213,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1224,6 +1233,9 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest + - name: Setup firefox + id: setup-firefox + uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1241,7 +1253,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1261,6 +1273,9 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest + - name: Setup firefox + id: setup-firefox + uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1278,7 +1293,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1305,7 +1320,7 @@ jobs: if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/spawn_hybrid needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1332,7 +1347,7 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1359,7 +1374,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1386,7 +1401,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1413,7 +1428,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1440,7 +1455,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1467,7 +1482,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1494,7 +1509,7 @@ jobs: if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/spawn_hybrid needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1521,7 +1536,7 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 @@ -1539,7 +1554,7 @@ jobs: env: CHAT_WEBHOOK_URL: "${{ secrets.BUILD_AND_TEST_TEAM_CHAT_WEBHOOK_URL }}" needs: - - job_001 + # - job_001 - job_002 - job_003 - job_004 From aa4694a51512cea2bfe583b55ae042a0d604c9b8 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Thu, 12 Sep 2024 23:54:19 +0000 Subject: [PATCH 15/21] Try more hacks in combination with setup-firefox --- pkgs/test/lib/src/runner/browser/default_settings.dart | 1 + pkgs/test/lib/src/runner/browser/firefox.dart | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/test/lib/src/runner/browser/default_settings.dart b/pkgs/test/lib/src/runner/browser/default_settings.dart index 3b3f367d4..8c620ca2e 100644 --- a/pkgs/test/lib/src/runner/browser/default_settings.dart +++ b/pkgs/test/lib/src/runner/browser/default_settings.dart @@ -29,6 +29,7 @@ final defaultSettings = UnmodifiableMapView({ '/Applications/Firefox.app/Contents/MacOS/firefox-bin', '~/Applications/Firefox.app/Contents/MacOS/firefox', '~/Applications/Firefox.app/Contents/MacOS/firefox', + 'firefox', ], windowsExecutable: r'Mozilla Firefox\firefox.exe', environmentOverride: 'FIREFOX_EXECUTABLE'), diff --git a/pkgs/test/lib/src/runner/browser/firefox.dart b/pkgs/test/lib/src/runner/browser/firefox.dart index f3fd5b161..2ed0f36ac 100644 --- a/pkgs/test/lib/src/runner/browser/firefox.dart +++ b/pkgs/test/lib/src/runner/browser/firefox.dart @@ -47,7 +47,8 @@ class Firefox extends Browser { for (final file in Directory('~').listSync()) { print(file.path); } - + final findResult = await Process.run('find', ['firefox']); + print(findResult.stdout); var process = await Process.start(settings.executable, [ '--profile', dir, From 2f8d38e5c1427313d40761e61a445185bad08c94 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Fri, 13 Sep 2024 00:05:49 +0000 Subject: [PATCH 16/21] read home directory instead of ~ --- pkgs/test/lib/src/runner/browser/firefox.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/test/lib/src/runner/browser/firefox.dart b/pkgs/test/lib/src/runner/browser/firefox.dart index 2ed0f36ac..a66b3f55b 100644 --- a/pkgs/test/lib/src/runner/browser/firefox.dart +++ b/pkgs/test/lib/src/runner/browser/firefox.dart @@ -44,11 +44,13 @@ class Firefox extends Browser { for (final file in Directory('/Applications/').listSync()) { print(file.path); } - for (final file in Directory('~').listSync()) { + final home = Platform.environment['HOME']!; + for (final file in Directory(home).listSync()) { print(file.path); } final findResult = await Process.run('find', ['firefox']); print(findResult.stdout); + var process = await Process.start(settings.executable, [ '--profile', dir, From d2175011b4bd4759a39136dc8b5085d94ec29239 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Fri, 13 Sep 2024 00:18:18 +0000 Subject: [PATCH 17/21] ~ paths don't work --- pkgs/test/lib/src/runner/browser/default_settings.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/test/lib/src/runner/browser/default_settings.dart b/pkgs/test/lib/src/runner/browser/default_settings.dart index 8c620ca2e..4affde1ed 100644 --- a/pkgs/test/lib/src/runner/browser/default_settings.dart +++ b/pkgs/test/lib/src/runner/browser/default_settings.dart @@ -27,8 +27,6 @@ final defaultSettings = UnmodifiableMapView({ macOSExecutables: [ '/Applications/Firefox.app/Contents/MacOS/firefox-bin', '/Applications/Firefox.app/Contents/MacOS/firefox-bin', - '~/Applications/Firefox.app/Contents/MacOS/firefox', - '~/Applications/Firefox.app/Contents/MacOS/firefox', 'firefox', ], windowsExecutable: r'Mozilla Firefox\firefox.exe', From b1af8268234c853b3d57a474f2aba70e16a61eb1 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Fri, 13 Sep 2024 00:33:39 +0000 Subject: [PATCH 18/21] Drop debug logging --- pkgs/test/lib/src/runner/browser/firefox.dart | 10 ---------- pkgs/test/lib/src/runner/executable_settings.dart | 1 - 2 files changed, 11 deletions(-) diff --git a/pkgs/test/lib/src/runner/browser/firefox.dart b/pkgs/test/lib/src/runner/browser/firefox.dart index a66b3f55b..503f103c0 100644 --- a/pkgs/test/lib/src/runner/browser/firefox.dart +++ b/pkgs/test/lib/src/runner/browser/firefox.dart @@ -41,16 +41,6 @@ class Firefox extends Browser { var dir = createTempDir(); File(p.join(dir, 'prefs.js')).writeAsStringSync(_preferences); - for (final file in Directory('/Applications/').listSync()) { - print(file.path); - } - final home = Platform.environment['HOME']!; - for (final file in Directory(home).listSync()) { - print(file.path); - } - final findResult = await Process.run('find', ['firefox']); - print(findResult.stdout); - var process = await Process.start(settings.executable, [ '--profile', dir, diff --git a/pkgs/test/lib/src/runner/executable_settings.dart b/pkgs/test/lib/src/runner/executable_settings.dart index 55a8cf13e..8640d6b30 100644 --- a/pkgs/test/lib/src/runner/executable_settings.dart +++ b/pkgs/test/lib/src/runner/executable_settings.dart @@ -54,7 +54,6 @@ class ExecutableSettings { if (p.basename(path) == path) return path; if (p.isAbsolute(path)) { if (File(path).existsSync()) return path; - print('Non-existent absolute path: $path'); } else { throw ArgumentError( 'Mac OS executable must be a basename or an absolute path.' From ef4e550427bea3e9a3e16fc56d4f1e7dc2e285ab Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Fri, 13 Sep 2024 00:34:33 +0000 Subject: [PATCH 19/21] check again if setup-dart is making the difference --- .github/workflows/dart.yml | 135 +++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 75 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index cc4b53af3..d0db67731 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -16,29 +16,29 @@ env: permissions: read-all jobs: - # job_001: - # name: mono_repo self validate - # runs-on: ubuntu-latest - # steps: - # - name: Cache Pub hosted dependencies - # uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 - # with: - # path: "~/.pub-cache/hosted" - # key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" - # restore-keys: | - # os:ubuntu-latest;pub-cache-hosted - # os:ubuntu-latest - # - name: Setup Dart SDK - # uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 - # with: - # sdk: stable - # - id: checkout - # name: Checkout repository - # uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - # - name: mono_repo self validate - # run: dart pub global activate mono_repo 6.6.2 - # - name: mono_repo self validate - # run: dart pub global run mono_repo generate --validate + job_001: + name: mono_repo self validate + runs-on: ubuntu-latest + steps: + - name: Cache Pub hosted dependencies + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - name: Setup Dart SDK + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + with: + sdk: stable + - id: checkout + name: Checkout repository + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - name: mono_repo self validate + run: dart pub global activate mono_repo 6.6.2 + - name: mono_repo self validate + run: dart pub global run mono_repo generate --validate job_002: name: "analyze_and_format; linux; Dart 3.5.0-311.0.dev; PKGS: integration_tests/regression, integration_tests/wasm; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`" runs-on: ubuntu-latest @@ -316,7 +316,7 @@ jobs: if: "always() && steps.integration_tests_regression_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/regression needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -353,7 +353,7 @@ jobs: if: "always() && steps.pkgs_checks_pub_upgrade.conclusion == 'success'" working-directory: pkgs/checks needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -390,7 +390,7 @@ jobs: if: "always() && steps.pkgs_test_core_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_core needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -427,7 +427,7 @@ jobs: if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/spawn_hybrid needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -464,7 +464,7 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -501,7 +501,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -538,7 +538,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -575,7 +575,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -612,7 +612,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -649,7 +649,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -686,7 +686,7 @@ jobs: if: "always() && steps.pkgs_test_api_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_api needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -723,7 +723,7 @@ jobs: if: "always() && steps.integration_tests_regression_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/regression needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -760,7 +760,7 @@ jobs: if: "always() && steps.pkgs_checks_pub_upgrade.conclusion == 'success'" working-directory: pkgs/checks needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -797,7 +797,7 @@ jobs: if: "always() && steps.pkgs_test_core_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_core needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -834,7 +834,7 @@ jobs: if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/spawn_hybrid needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -871,7 +871,7 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -908,7 +908,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -945,7 +945,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -982,7 +982,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1019,7 +1019,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1056,7 +1056,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1093,7 +1093,7 @@ jobs: if: "always() && steps.pkgs_test_api_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_api needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1113,9 +1113,6 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest - - name: Setup firefox - id: setup-firefox - uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1133,7 +1130,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1153,9 +1150,6 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest - - name: Setup firefox - id: setup-firefox - uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1173,7 +1167,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1193,9 +1187,6 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest - - name: Setup firefox - id: setup-firefox - uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1213,7 +1204,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1233,9 +1224,6 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest - - name: Setup firefox - id: setup-firefox - uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1253,7 +1241,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1273,9 +1261,6 @@ jobs: os:macos-latest;pub-cache-hosted;sdk:3.5.0-311.0.dev os:macos-latest;pub-cache-hosted os:macos-latest - - name: Setup firefox - id: setup-firefox - uses: browser-actions/setup-firefox@v1 - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: @@ -1293,7 +1278,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1320,7 +1305,7 @@ jobs: if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/spawn_hybrid needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1347,7 +1332,7 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1374,7 +1359,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1401,7 +1386,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1428,7 +1413,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1455,7 +1440,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1482,7 +1467,7 @@ jobs: if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1509,7 +1494,7 @@ jobs: if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/spawn_hybrid needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1536,7 +1521,7 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 @@ -1554,7 +1539,7 @@ jobs: env: CHAT_WEBHOOK_URL: "${{ secrets.BUILD_AND_TEST_TEAM_CHAT_WEBHOOK_URL }}" needs: - # - job_001 + - job_001 - job_002 - job_003 - job_004 From 945d319f910f1af66c4652839e24b0ea7c93d351 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Fri, 13 Sep 2024 00:35:15 +0000 Subject: [PATCH 20/21] Fix double entry --- pkgs/test/lib/src/runner/browser/default_settings.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/lib/src/runner/browser/default_settings.dart b/pkgs/test/lib/src/runner/browser/default_settings.dart index 4affde1ed..312fc1130 100644 --- a/pkgs/test/lib/src/runner/browser/default_settings.dart +++ b/pkgs/test/lib/src/runner/browser/default_settings.dart @@ -26,7 +26,7 @@ final defaultSettings = UnmodifiableMapView({ linuxExecutable: 'firefox', macOSExecutables: [ '/Applications/Firefox.app/Contents/MacOS/firefox-bin', - '/Applications/Firefox.app/Contents/MacOS/firefox-bin', + '/Applications/Firefox.app/Contents/MacOS/firefox', 'firefox', ], windowsExecutable: r'Mozilla Firefox\firefox.exe', From d388e856410c35d67a60ab4112341c7d55af056f Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Fri, 13 Sep 2024 17:34:33 +0000 Subject: [PATCH 21/21] Restore skip Cannot currently add setup firefox action Tweak failure message. --- pkgs/test/lib/src/runner/executable_settings.dart | 4 ++-- pkgs/test/test/runner/compiler_runtime_matrix_test.dart | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/test/lib/src/runner/executable_settings.dart b/pkgs/test/lib/src/runner/executable_settings.dart index 8640d6b30..904dc5149 100644 --- a/pkgs/test/lib/src/runner/executable_settings.dart +++ b/pkgs/test/lib/src/runner/executable_settings.dart @@ -61,8 +61,8 @@ class ExecutableSettings { } } } - throw ArgumentError('Could not find an existing macOS executable in' - '$_macOSExectuables'); + throw ArgumentError('Could not find a command basename or an existing ' + 'path in $_macOSExectuables'); } if (!Platform.isWindows) return _linuxExecutable!; final windowsExecutable = _windowsExecutable!; diff --git a/pkgs/test/test/runner/compiler_runtime_matrix_test.dart b/pkgs/test/test/runner/compiler_runtime_matrix_test.dart index 059222247..74d880239 100644 --- a/pkgs/test/test/runner/compiler_runtime_matrix_test.dart +++ b/pkgs/test/test/runner/compiler_runtime_matrix_test.dart @@ -34,6 +34,8 @@ void main() { } else if ([Runtime.firefox, Runtime.nodeJS].contains(runtime) && Platform.isWindows) { skipReason = 'https://github.com/dart-lang/test/issues/1942'; + } else if (runtime == Runtime.firefox && Platform.isMacOS) { + skipReason = 'https://github.com/dart-lang/test/pull/2276'; } group('--runtime ${runtime.identifier} --compiler ${compiler.identifier}', skip: skipReason, () {