From 6593f10db1774a7ae47ff33b46b7a04568e1b54f Mon Sep 17 00:00:00 2001 From: Dillon Nys Date: Fri, 16 Sep 2022 09:05:35 -0700 Subject: [PATCH] chore(aft): Remove from mono_repo The package libgit2dart, while it can be used in Dart-only packages tricks pub into thinking it has a dependency on Flutter. mono_repo cannot handle this discrepancy. commit-id:ec27a8d2 --- .github/workflows/lint.yml | 19 +-- .github/workflows/test.yml | 263 ++++++++++++++++++------------------- packages/aft/mono_pkg.yaml | 10 -- tool/ci.sh | 8 +- 4 files changed, 134 insertions(+), 166 deletions(-) delete mode 100644 packages/aft/mono_pkg.yaml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 67b0cbfd492..d546da0a7ef 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -535,16 +535,16 @@ jobs: working-directory: packages/secure_storage/amplify_secure_storage_test run: dart analyze --fatal-infos lib test job_009: - name: "analyze_and_format; Dart stable; PKGS: packages/aft, packages/amplify_core, packages/auth/amplify_auth_cognito_test, packages/aws_common, packages/aws_signature_v4/example, packages/example_common, packages/secure_storage/amplify_secure_storage_dart/example, packages/smithy/goldens/lib/awsJson1_0, packages/smithy/goldens/lib/awsJson1_1, packages/smithy/goldens/lib/restJson1, packages/smithy/goldens/lib/restXml, packages/smithy/goldens/lib/restXmlWithNamespace, packages/smithy/smithy, packages/smithy/smithy_aws, packages/smithy/smithy_codegen, packages/smithy/smithy_test, packages/worker_bee/e2e, packages/worker_bee/e2e_test, packages/worker_bee/worker_bee, packages/worker_bee/worker_bee_builder; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" + name: "analyze_and_format; Dart stable; PKGS: packages/amplify_core, packages/auth/amplify_auth_cognito_test, packages/aws_common, packages/aws_signature_v4/example, packages/example_common, packages/secure_storage/amplify_secure_storage_dart/example, packages/smithy/goldens/lib/awsJson1_0, packages/smithy/goldens/lib/awsJson1_1, packages/smithy/goldens/lib/restJson1, packages/smithy/goldens/lib/restXml, packages/smithy/goldens/lib/restXmlWithNamespace, packages/smithy/smithy, packages/smithy/smithy_aws, packages/smithy/smithy_codegen, packages/smithy/smithy_test, packages/worker_bee/e2e, packages/worker_bee/e2e_test, packages/worker_bee/worker_bee, packages/worker_bee/worker_bee_builder; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/aft-packages/amplify_core-packages/auth/amplify_auth_cognito_test-packages/aws_common-packages/aws_signature_v4/example-packages/example_common-packages/secure_storage/amplify_secure_storage_dart/example-packages/smithy/goldens/lib/awsJson1_0-packages/smithy/goldens/lib/awsJson1_1-packages/smithy/goldens/lib/restJson1-packages/smithy/goldens/lib/restXml-packages/smithy/goldens/lib/restXmlWithNamespace-packages/smithy/s-!!too_long!!-725-339769703" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/amplify_core-packages/auth/amplify_auth_cognito_test-packages/aws_common-packages/aws_signature_v4/example-packages/example_common-packages/secure_storage/amplify_secure_storage_dart/example-packages/smithy/goldens/lib/awsJson1_0-packages/smithy/goldens/lib/awsJson1_1-packages/smithy/goldens/lib/restJson1-packages/smithy/goldens/lib/restXml-packages/smithy/goldens/lib/restXmlWithNamespace-packages/smithy/smithy-package-!!too_long!!-712-873801266" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/aft-packages/amplify_core-packages/auth/amplify_auth_cognito_test-packages/aws_common-packages/aws_signature_v4/example-packages/example_common-packages/secure_storage/amplify_secure_storage_dart/example-packages/smithy/goldens/lib/awsJson1_0-packages/smithy/goldens/lib/awsJson1_1-packages/smithy/goldens/lib/restJson1-packages/smithy/goldens/lib/restXml-packages/smithy/goldens/lib/restXmlWithNamespace-packages/smithy/s-!!too_long!!-699-852681108 + os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/amplify_core-packages/auth/amplify_auth_cognito_test-packages/aws_common-packages/aws_signature_v4/example-packages/example_common-packages/secure_storage/amplify_secure_storage_dart/example-packages/smithy/goldens/lib/awsJson1_0-packages/smithy/goldens/lib/awsJson1_1-packages/smithy/goldens/lib/restJson1-packages/smithy/goldens/lib/restXml-packages/smithy/goldens/lib/restXmlWithNamespace-packages/smithy/smithy-package-!!too_long!!-686-736350681 os:ubuntu-latest;pub-cache-hosted;sdk:stable os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -553,19 +553,6 @@ jobs: sdk: stable - id: checkout uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - - id: packages_aft_pub_upgrade - name: packages/aft; dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: packages/aft - run: dart pub upgrade - - name: "packages/aft; dart format --output=none --set-exit-if-changed ." - if: "always() && steps.packages_aft_pub_upgrade.conclusion == 'success'" - working-directory: packages/aft - run: "dart format --output=none --set-exit-if-changed ." - - name: "packages/aft; dart analyze --fatal-infos ." - if: "always() && steps.packages_aft_pub_upgrade.conclusion == 'success'" - working-directory: packages/aft - run: dart analyze --fatal-infos . - id: packages_amplify_core_pub_upgrade name: packages/amplify_core; dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 30374b8866d..50f05721638 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -52,7 +52,7 @@ jobs: uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:packages/aws_common;commands:command_4" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:packages/aws_common;commands:test_2" restore-keys: | os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:packages/aws_common os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0 @@ -108,7 +108,7 @@ jobs: uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:packages/aws_signature_v4;commands:command_5-test_0-command_4" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:packages/aws_signature_v4;commands:command_5-test_0-test_2" restore-keys: | os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:packages/aws_signature_v4 os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0 @@ -419,7 +419,7 @@ jobs: uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:packages/aws_common;commands:command_4" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:packages/aws_common;commands:test_2" restore-keys: | os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:packages/aws_common os:ubuntu-latest;pub-cache-hosted;sdk:dev @@ -447,7 +447,7 @@ jobs: uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:packages/aws_signature_v4;commands:command_5-test_0-command_4" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:packages/aws_signature_v4;commands:command_5-test_0-test_2" restore-keys: | os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:packages/aws_signature_v4 os:ubuntu-latest;pub-cache-hosted;sdk:dev @@ -724,16 +724,16 @@ jobs: working-directory: packages/worker_bee/e2e_test run: "dart run build_runner test --release --delete-conflicting-outputs --verbose -- -p chrome,firefox" job_017: - name: "unit_test; linux; Dart stable; PKGS: packages/aft, packages/amplify_core, packages/auth/amplify_auth_cognito_test, packages/aws_common, packages/smithy/goldens/lib/awsJson1_0, packages/smithy/goldens/lib/awsJson1_1, packages/smithy/goldens/lib/restJson1, packages/smithy/goldens/lib/restXml, packages/smithy/goldens/lib/restXmlWithNamespace, packages/smithy/smithy, packages/smithy/smithy_aws, packages/smithy/smithy_codegen, packages/worker_bee/e2e_test; `dart test`" + name: "unit_test; linux; Dart stable; PKGS: packages/amplify_core, packages/auth/amplify_auth_cognito_test, packages/secure_storage/amplify_secure_storage_test; `dart --version`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/aft-packages/amplify_core-packages/auth/amplify_auth_cognito_test-packages/aws_common-packages/smithy/goldens/lib/awsJson1_0-packages/smithy/goldens/lib/awsJson1_1-packages/smithy/goldens/lib/restJson1-packages/smithy/goldens/lib/restXml-packages/smithy/goldens/lib/restXmlWithNamespace-packages/smithy/smithy-packages/smithy/smithy_aws-packages/smithy/smithy_codegen-packages/worker_bee/e2e_test;commands:test_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/amplify_core-packages/auth/amplify_auth_cognito_test-packages/secure_storage/amplify_secure_storage_test;commands:command_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/aft-packages/amplify_core-packages/auth/amplify_auth_cognito_test-packages/aws_common-packages/smithy/goldens/lib/awsJson1_0-packages/smithy/goldens/lib/awsJson1_1-packages/smithy/goldens/lib/restJson1-packages/smithy/goldens/lib/restXml-packages/smithy/goldens/lib/restXmlWithNamespace-packages/smithy/smithy-packages/smithy/smithy_aws-packages/smithy/smithy_codegen-packages/worker_bee/e2e_test + os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/amplify_core-packages/auth/amplify_auth_cognito_test-packages/secure_storage/amplify_secure_storage_test os:ubuntu-latest;pub-cache-hosted;sdk:stable os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -742,15 +742,126 @@ jobs: sdk: stable - id: checkout uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - - id: packages_aft_pub_upgrade - name: packages/aft; dart pub upgrade + - id: packages_amplify_core_pub_upgrade + name: packages/amplify_core; dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: packages/aft + working-directory: packages/amplify_core run: dart pub upgrade - - name: packages/aft; dart test - if: "always() && steps.packages_aft_pub_upgrade.conclusion == 'success'" - working-directory: packages/aft - run: dart test + - name: "packages/amplify_core; dart --version" + if: "always() && steps.packages_amplify_core_pub_upgrade.conclusion == 'success'" + working-directory: packages/amplify_core + run: dart --version + - id: packages_auth_amplify_auth_cognito_test_pub_upgrade + name: packages/auth/amplify_auth_cognito_test; dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: packages/auth/amplify_auth_cognito_test + run: dart pub upgrade + - name: "packages/auth/amplify_auth_cognito_test; dart --version" + if: "always() && steps.packages_auth_amplify_auth_cognito_test_pub_upgrade.conclusion == 'success'" + working-directory: packages/auth/amplify_auth_cognito_test + run: dart --version + - id: packages_secure_storage_amplify_secure_storage_test_pub_upgrade + name: packages/secure_storage/amplify_secure_storage_test; dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: packages/secure_storage/amplify_secure_storage_test + run: dart pub upgrade + - name: "packages/secure_storage/amplify_secure_storage_test; dart --version" + if: "always() && steps.packages_secure_storage_amplify_secure_storage_test_pub_upgrade.conclusion == 'success'" + working-directory: packages/secure_storage/amplify_secure_storage_test + run: dart --version + job_018: + name: "unit_test; linux; Dart stable; PKG: packages/amplify_core; `dart run build_runner test --delete-conflicting-outputs -- -p chrome,firefox`" + runs-on: ubuntu-latest + steps: + - name: Cache Pub hosted dependencies + uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/amplify_core;commands:command_1" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/amplify_core + os:ubuntu-latest;pub-cache-hosted;sdk:stable + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + with: + sdk: stable + - id: checkout + uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 + - id: packages_amplify_core_pub_upgrade + name: packages/amplify_core; dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: packages/amplify_core + run: dart pub upgrade + - name: "packages/amplify_core; dart run build_runner test --delete-conflicting-outputs -- -p chrome,firefox" + if: "always() && steps.packages_amplify_core_pub_upgrade.conclusion == 'success'" + working-directory: packages/amplify_core + run: "dart run build_runner test --delete-conflicting-outputs -- -p chrome,firefox" + job_019: + name: "unit_test; linux; Dart stable; PKGS: packages/amplify_core, packages/auth/amplify_auth_cognito_test, packages/secure_storage/amplify_secure_storage_test; `dart run build_runner test --release --delete-conflicting-outputs -- -p chrome,firefox`" + runs-on: ubuntu-latest + steps: + - name: Cache Pub hosted dependencies + uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/amplify_core-packages/auth/amplify_auth_cognito_test-packages/secure_storage/amplify_secure_storage_test;commands:command_2" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/amplify_core-packages/auth/amplify_auth_cognito_test-packages/secure_storage/amplify_secure_storage_test + os:ubuntu-latest;pub-cache-hosted;sdk:stable + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + with: + sdk: stable + - id: checkout + uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 + - id: packages_amplify_core_pub_upgrade + name: packages/amplify_core; dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: packages/amplify_core + run: dart pub upgrade + - name: "packages/amplify_core; dart run build_runner test --release --delete-conflicting-outputs -- -p chrome,firefox" + if: "always() && steps.packages_amplify_core_pub_upgrade.conclusion == 'success'" + working-directory: packages/amplify_core + run: "dart run build_runner test --release --delete-conflicting-outputs -- -p chrome,firefox" + - id: packages_auth_amplify_auth_cognito_test_pub_upgrade + name: packages/auth/amplify_auth_cognito_test; dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: packages/auth/amplify_auth_cognito_test + run: dart pub upgrade + - name: "packages/auth/amplify_auth_cognito_test; dart run build_runner test --release --delete-conflicting-outputs -- -p chrome,firefox" + if: "always() && steps.packages_auth_amplify_auth_cognito_test_pub_upgrade.conclusion == 'success'" + working-directory: packages/auth/amplify_auth_cognito_test + run: "dart run build_runner test --release --delete-conflicting-outputs -- -p chrome,firefox" + - id: packages_secure_storage_amplify_secure_storage_test_pub_upgrade + name: packages/secure_storage/amplify_secure_storage_test; dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: packages/secure_storage/amplify_secure_storage_test + run: dart pub upgrade + - name: "packages/secure_storage/amplify_secure_storage_test; dart run build_runner test --release --delete-conflicting-outputs -- -p chrome,firefox" + if: "always() && steps.packages_secure_storage_amplify_secure_storage_test_pub_upgrade.conclusion == 'success'" + working-directory: packages/secure_storage/amplify_secure_storage_test + run: "dart run build_runner test --release --delete-conflicting-outputs -- -p chrome,firefox" + job_020: + name: "unit_test; linux; Dart stable; PKGS: packages/amplify_core, packages/auth/amplify_auth_cognito_test, packages/aws_common, packages/smithy/goldens/lib/awsJson1_0, packages/smithy/goldens/lib/awsJson1_1, packages/smithy/goldens/lib/restJson1, packages/smithy/goldens/lib/restXml, packages/smithy/goldens/lib/restXmlWithNamespace, packages/smithy/smithy, packages/smithy/smithy_aws, packages/smithy/smithy_codegen, packages/worker_bee/e2e_test; `dart test`" + runs-on: ubuntu-latest + steps: + - name: Cache Pub hosted dependencies + uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/amplify_core-packages/auth/amplify_auth_cognito_test-packages/aws_common-packages/smithy/goldens/lib/awsJson1_0-packages/smithy/goldens/lib/awsJson1_1-packages/smithy/goldens/lib/restJson1-packages/smithy/goldens/lib/restXml-packages/smithy/goldens/lib/restXmlWithNamespace-packages/smithy/smithy-packages/smithy/smithy_aws-packages/smithy/smithy_codegen-packages/worker_bee/e2e_test;commands:test_0" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/amplify_core-packages/auth/amplify_auth_cognito_test-packages/aws_common-packages/smithy/goldens/lib/awsJson1_0-packages/smithy/goldens/lib/awsJson1_1-packages/smithy/goldens/lib/restJson1-packages/smithy/goldens/lib/restXml-packages/smithy/goldens/lib/restXmlWithNamespace-packages/smithy/smithy-packages/smithy/smithy_aws-packages/smithy/smithy_codegen-packages/worker_bee/e2e_test + os:ubuntu-latest;pub-cache-hosted;sdk:stable + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + with: + sdk: stable + - id: checkout + uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - id: packages_amplify_core_pub_upgrade name: packages/amplify_core; dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" @@ -859,126 +970,6 @@ jobs: if: "always() && steps.packages_worker_bee_e2e_test_pub_upgrade.conclusion == 'success'" working-directory: packages/worker_bee/e2e_test run: dart test - job_018: - name: "unit_test; linux; Dart stable; PKGS: packages/amplify_core, packages/auth/amplify_auth_cognito_test, packages/secure_storage/amplify_secure_storage_test; `dart --version`" - runs-on: ubuntu-latest - steps: - - name: Cache Pub hosted dependencies - uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 - with: - path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/amplify_core-packages/auth/amplify_auth_cognito_test-packages/secure_storage/amplify_secure_storage_test;commands:command_0" - restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/amplify_core-packages/auth/amplify_auth_cognito_test-packages/secure_storage/amplify_secure_storage_test - os:ubuntu-latest;pub-cache-hosted;sdk:stable - os:ubuntu-latest;pub-cache-hosted - os:ubuntu-latest - - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d - with: - sdk: stable - - id: checkout - uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - - id: packages_amplify_core_pub_upgrade - name: packages/amplify_core; dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: packages/amplify_core - run: dart pub upgrade - - name: "packages/amplify_core; dart --version" - if: "always() && steps.packages_amplify_core_pub_upgrade.conclusion == 'success'" - working-directory: packages/amplify_core - run: dart --version - - id: packages_auth_amplify_auth_cognito_test_pub_upgrade - name: packages/auth/amplify_auth_cognito_test; dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: packages/auth/amplify_auth_cognito_test - run: dart pub upgrade - - name: "packages/auth/amplify_auth_cognito_test; dart --version" - if: "always() && steps.packages_auth_amplify_auth_cognito_test_pub_upgrade.conclusion == 'success'" - working-directory: packages/auth/amplify_auth_cognito_test - run: dart --version - - id: packages_secure_storage_amplify_secure_storage_test_pub_upgrade - name: packages/secure_storage/amplify_secure_storage_test; dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: packages/secure_storage/amplify_secure_storage_test - run: dart pub upgrade - - name: "packages/secure_storage/amplify_secure_storage_test; dart --version" - if: "always() && steps.packages_secure_storage_amplify_secure_storage_test_pub_upgrade.conclusion == 'success'" - working-directory: packages/secure_storage/amplify_secure_storage_test - run: dart --version - job_019: - name: "unit_test; linux; Dart stable; PKG: packages/amplify_core; `dart run build_runner test --delete-conflicting-outputs -- -p chrome,firefox`" - runs-on: ubuntu-latest - steps: - - name: Cache Pub hosted dependencies - uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 - with: - path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/amplify_core;commands:command_1" - restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/amplify_core - os:ubuntu-latest;pub-cache-hosted;sdk:stable - os:ubuntu-latest;pub-cache-hosted - os:ubuntu-latest - - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d - with: - sdk: stable - - id: checkout - uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - - id: packages_amplify_core_pub_upgrade - name: packages/amplify_core; dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: packages/amplify_core - run: dart pub upgrade - - name: "packages/amplify_core; dart run build_runner test --delete-conflicting-outputs -- -p chrome,firefox" - if: "always() && steps.packages_amplify_core_pub_upgrade.conclusion == 'success'" - working-directory: packages/amplify_core - run: "dart run build_runner test --delete-conflicting-outputs -- -p chrome,firefox" - job_020: - name: "unit_test; linux; Dart stable; PKGS: packages/amplify_core, packages/auth/amplify_auth_cognito_test, packages/secure_storage/amplify_secure_storage_test; `dart run build_runner test --release --delete-conflicting-outputs -- -p chrome,firefox`" - runs-on: ubuntu-latest - steps: - - name: Cache Pub hosted dependencies - uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 - with: - path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/amplify_core-packages/auth/amplify_auth_cognito_test-packages/secure_storage/amplify_secure_storage_test;commands:command_2" - restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/amplify_core-packages/auth/amplify_auth_cognito_test-packages/secure_storage/amplify_secure_storage_test - os:ubuntu-latest;pub-cache-hosted;sdk:stable - os:ubuntu-latest;pub-cache-hosted - os:ubuntu-latest - - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d - with: - sdk: stable - - id: checkout - uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28 - - id: packages_amplify_core_pub_upgrade - name: packages/amplify_core; dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: packages/amplify_core - run: dart pub upgrade - - name: "packages/amplify_core; dart run build_runner test --release --delete-conflicting-outputs -- -p chrome,firefox" - if: "always() && steps.packages_amplify_core_pub_upgrade.conclusion == 'success'" - working-directory: packages/amplify_core - run: "dart run build_runner test --release --delete-conflicting-outputs -- -p chrome,firefox" - - id: packages_auth_amplify_auth_cognito_test_pub_upgrade - name: packages/auth/amplify_auth_cognito_test; dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: packages/auth/amplify_auth_cognito_test - run: dart pub upgrade - - name: "packages/auth/amplify_auth_cognito_test; dart run build_runner test --release --delete-conflicting-outputs -- -p chrome,firefox" - if: "always() && steps.packages_auth_amplify_auth_cognito_test_pub_upgrade.conclusion == 'success'" - working-directory: packages/auth/amplify_auth_cognito_test - run: "dart run build_runner test --release --delete-conflicting-outputs -- -p chrome,firefox" - - id: packages_secure_storage_amplify_secure_storage_test_pub_upgrade - name: packages/secure_storage/amplify_secure_storage_test; dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: packages/secure_storage/amplify_secure_storage_test - run: dart pub upgrade - - name: "packages/secure_storage/amplify_secure_storage_test; dart run build_runner test --release --delete-conflicting-outputs -- -p chrome,firefox" - if: "always() && steps.packages_secure_storage_amplify_secure_storage_test_pub_upgrade.conclusion == 'success'" - working-directory: packages/secure_storage/amplify_secure_storage_test - run: "dart run build_runner test --release --delete-conflicting-outputs -- -p chrome,firefox" job_021: name: "unit_test; linux; Dart stable; PKG: packages/aws_common; `dart run build_runner test -- -p chrome,firefox`" runs-on: ubuntu-latest @@ -1015,7 +1006,7 @@ jobs: uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/aws_common;commands:command_4" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/aws_common;commands:test_2" restore-keys: | os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/aws_common os:ubuntu-latest;pub-cache-hosted;sdk:stable @@ -1043,7 +1034,7 @@ jobs: uses: actions/cache@4504faf7e9bcf8f3ed0bc863c4e1d21499ab8ef8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/aws_signature_v4;commands:command_5-test_0-command_4" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/aws_signature_v4;commands:command_5-test_0-test_2" restore-keys: | os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/aws_signature_v4 os:ubuntu-latest;pub-cache-hosted;sdk:stable diff --git a/packages/aft/mono_pkg.yaml b/packages/aft/mono_pkg.yaml deleted file mode 100644 index 812312a82f1..00000000000 --- a/packages/aft/mono_pkg.yaml +++ /dev/null @@ -1,10 +0,0 @@ -sdk: - - stable - -stages: - - analyze_and_format: - - group: - - format - - analyze: --fatal-infos . - - unit_test: - - test: diff --git a/tool/ci.sh b/tool/ci.sh index 977d3474cbe..58c49972734 100755 --- a/tool/ci.sh +++ b/tool/ci.sh @@ -103,10 +103,6 @@ for PKG in ${PKGS}; do echo 'dart run build_runner test -- -p chrome,firefox' dart run build_runner test -- -p chrome,firefox || EXIT_CODE=$? ;; - command_4) - echo 'dart test -p chrome,firefox' - dart test -p chrome,firefox || EXIT_CODE=$? - ;; command_5) echo 'git submodule update --init' git submodule update --init || EXIT_CODE=$? @@ -135,6 +131,10 @@ for PKG in ${PKGS}; do echo 'dart test --tags=build' dart test --tags=build || EXIT_CODE=$? ;; + test_2) + echo 'dart test -p chrome,firefox' + dart test -p chrome,firefox || EXIT_CODE=$? + ;; test_3) echo 'dart test -p chrome' dart test -p chrome || EXIT_CODE=$?