Skip to content

Commit e285a2b

Browse files
fjnoypfjnoyp
authored
Merge branch 'next' into feat/next/analytics_migrate_new_new
2 parents 87006ed + f7a89fa commit e285a2b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+3377
-326
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ commands:
4242
- run:
4343
name: Install and set up aft
4444
command: |
45+
git submodule update --init
4546
flutter pub global activate -spath packages/aft
4647
aft bootstrap
4748
activate_pana:

‎.github/workflows/aft.yaml‎

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
# Generated with aft. To update, run: `aft generate workflows`
21
name: aft
32
on:
43
push:
54
branches:
65
- main
76
- stable
87
- next
8+
paths:
9+
- 'packages/aft/**/*.dart'
910
pull_request:
1011
paths:
1112
- 'packages/aft/**/*.dart'
12-
- 'packages/aft/**/*.yaml'
13-
- 'packages/aft/lib/**/*'
14-
- 'packages/aft/test/**/*'
15-
- '.github/workflows/dart_vm.yaml'
16-
- '.github/workflows/dart_native.yaml'
17-
- '.github/workflows/aft.yaml'
1813
schedule:
1914
- cron: "0 0 * * 0" # Every Sunday at 00:00
2015
defaults:
@@ -24,12 +19,34 @@ permissions: read-all
2419

2520
jobs:
2621
test:
27-
uses: ./.github/workflows/dart_vm.yaml
28-
with:
29-
working-directory: packages/aft
30-
native_test:
31-
if: ${{ github.event_name == 'push' }}
32-
needs: test
33-
uses: ./.github/workflows/dart_native.yaml
34-
with:
35-
working-directory: packages/aft
22+
name: Test
23+
runs-on: ubuntu-latest
24+
steps:
25+
- name: Git Checkout
26+
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # 3.1.0
27+
with:
28+
submodules: true
29+
30+
# Needed for `git` but only ever used locally.
31+
- name: Git Config
32+
run: |
33+
git config --global user.email "[email protected]"
34+
git config --global user.name "Amplify Flutter"
35+
36+
- name: Setup Dart
37+
uses: dart-lang/setup-dart@196f54580e9eee2797c57e85e289339f85e6779d # main
38+
with:
39+
sdk: stable
40+
41+
- name: Get Packages
42+
working-directory: packages/aft
43+
run: |
44+
# Patch libgit2dart (see https://github.com/dart-lang/pub/issues/3563)
45+
( cd external/libgit2dart; git apply ../libgit2dart.patch )
46+
dart pub upgrade
47+
mkdir linux
48+
cp external/libgit2dart/linux/*.so linux
49+
50+
- name: Run Tests
51+
working-directory: packages/aft
52+
run: dart test

‎.github/workflows/dart_dart2js.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ jobs:
5050
sdk: ${{ matrix.sdk }}
5151

5252
- name: Setup aft
53-
run: dart pub global activate -spath packages/aft
53+
run: |
54+
# Patch libgit2dart (see https://github.com/dart-lang/pub/issues/3563)
55+
( cd packages/aft/external/libgit2dart; git apply ../libgit2dart.patch )
56+
dart pub global activate -spath packages/aft
57+
( cd packages/aft/external/libgit2dart; git reset --hard HEAD )
5458
5559
- name: Setup Firefox
5660
if: ${{ matrix.browser == 'firefox' }}

‎.github/workflows/dart_ddc.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@ jobs:
5454
sdk: ${{ matrix.sdk }}
5555

5656
- name: Setup aft
57-
run: dart pub global activate -spath packages/aft
57+
run: |
58+
# Patch libgit2dart (see https://github.com/dart-lang/pub/issues/3563)
59+
( cd packages/aft/external/libgit2dart; git apply ../libgit2dart.patch )
60+
dart pub global activate -spath packages/aft
61+
( cd packages/aft/external/libgit2dart; git reset --hard HEAD )
5862
5963
- name: Setup Firefox
6064
if: ${{ matrix.browser == 'firefox' }}

‎.github/workflows/dart_native.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@ jobs:
5151
sdk: stable
5252

5353
- name: Setup aft
54-
run: dart pub global activate -spath packages/aft
54+
run: |
55+
# Patch libgit2dart (see https://github.com/dart-lang/pub/issues/3563)
56+
( cd packages/aft/external/libgit2dart; git apply ../libgit2dart.patch )
57+
dart pub global activate -spath packages/aft
58+
( cd packages/aft/external/libgit2dart; git reset --hard HEAD )
5559
5660
- name: Bootstrap
5761
id: bootstrap

‎.github/workflows/dart_vm.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ jobs:
4747
sdk: ${{ matrix.sdk }}
4848

4949
- name: Setup aft
50-
run: dart pub global activate -spath packages/aft
50+
run: |
51+
# Patch libgit2dart (see https://github.com/dart-lang/pub/issues/3563)
52+
( cd packages/aft/external/libgit2dart; git apply ../libgit2dart.patch )
53+
dart pub global activate -spath packages/aft
54+
( cd packages/aft/external/libgit2dart; git reset --hard HEAD )
5155
5256
- name: Bootstrap
5357
id: bootstrap

‎.github/workflows/flutter_vm.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323
- name: Git Checkout
2424
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # 3.1.0
2525

26+
- name: Git Submodules
27+
run: git submodule update --init
28+
2629
- name: Setup Flutter
2730
uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d # 2.8.0
2831
with:

‎.github/workflows/smoke_test.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Git Checkout
28-
uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v2.5.0
28+
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # 3.1.0
29+
30+
- name: Git Submodules
31+
run: git submodule update --init
2932

3033
- name: Setup Dart
3134
uses: dart-lang/setup-dart@196f54580e9eee2797c57e85e289339f85e6779d # main
@@ -34,6 +37,8 @@ jobs:
3437

3538
- name: Link Packages
3639
run: |
40+
# Patch libgit2dart (see https://github.com/dart-lang/pub/issues/3563)
41+
( cd packages/aft/external/libgit2dart; git apply ../libgit2dart.patch )
3742
dart pub global activate -spath packages/aft
3843
aft link
3944

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@
1111
path = packages/smithy/goldens/smithy
1212
url = https://github.com/awslabs/smithy.git
1313
branch = main
14+
[submodule "packages/aft/external/libgit2dart"]
15+
path = packages/aft/external/libgit2dart
16+
url = https://github.com/SkinnyMind/libgit2dart.git

‎aft.yaml‎

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,51 @@ dependencies:
1717
uuid: ">=3.0.6 <=3.0.7"
1818
xml: ">=6.1.0 <=6.2.2"
1919

20-
# Packages to ignore in all repo operations
20+
# Packages to ignore in all repo operations.
2121
ignore:
2222
- synthetic_package
23+
- libgit2dart
24+
25+
# Strongly connected components which should have version bumps happen
26+
# in unison, i.e. a version bump to one package cascades to all.
27+
#
28+
# By default, this happens only for minor version bumps. However, this
29+
# can be modified on a per-component basis using the `propagate` flag.
30+
components:
31+
- name: Amplify Flutter
32+
summary: amplify_flutter
33+
packages:
34+
- amplify_flutter
35+
- amplify_flutter_ios
36+
- amplify_flutter_android
37+
- amplify_core
38+
- amplify_datastore
39+
- amplify_datastore_plugin_interface
40+
- amplify_analytics_pinpoint
41+
- amplify_api
42+
- amplify_api_android
43+
- amplify_api_ios
44+
- amplify_auth_cognito
45+
- amplify_auth_cognito_android
46+
- amplify_auth_cognito_ios
47+
- amplify_storage_s3
48+
- name: Amplify Dart
49+
summary: amplify_core
50+
propagate: none
51+
packages:
52+
- amplify_auth_cognito_dart
53+
- amplify_analytics_pinpoint_dart
54+
- amplify_storage_s3_dart
55+
- name: Amplify UI
56+
packages:
57+
- amplify_authenticator
58+
- name: Smithy
59+
summary: smithy
60+
packages:
61+
- smithy
62+
- smithy_aws
63+
- name: Worker Bee
64+
summary: worker_bee
65+
packages:
66+
- worker_bee
67+
- worker_bee_builder

0 commit comments

Comments
 (0)