Skip to content

Commit aae3521

Browse files
committed
Merge remote-tracking branch 'upstream/v2' into wbinnssmith/merge-v2-2022-04-22
* upstream/v2: Add test for storing empty assets with LMDB (#7995) GitHub Actions: disable fail-fast for integration_tests (#8007) Drop Node 12 in tests and add Node 16 (#7935) Update Flow to 0.176.3 (#8006)
2 parents a698387 + 50893a7 commit aae3521

File tree

25 files changed

+480
-456
lines changed

25 files changed

+480
-456
lines changed

β€Ž.flowconfigβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ untyped-import
3636
untyped-type-import
3737

3838
[version]
39-
0.175.1
39+
0.176.3

β€Ž.github/workflows/ci.ymlβ€Ž

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
name: Unit tests (${{matrix.os}}, Node ${{matrix.node}})
4343
strategy:
4444
matrix:
45-
node: [12, 14]
45+
node: [14, 16]
4646
os: [ubuntu-latest, macos-latest, windows-latest]
4747
runs-on: ${{matrix.os}}
4848
steps:
@@ -64,8 +64,11 @@ jobs:
6464
name: Integration tests (${{matrix.os}}, Node ${{matrix.node}})
6565
strategy:
6666
matrix:
67-
node: [12, 14]
67+
node: [14, 16]
6868
os: [ubuntu-latest, macos-latest, windows-latest]
69+
# These tend to be quite flakey, so one failed instance shouldn't stop
70+
# others from potentially succeeding
71+
fail-fast: false
6972
runs-on: ${{matrix.os}}
7073
steps:
7174
- uses: actions/checkout@v2

β€ŽCargo.lockβ€Ž

Lines changed: 89 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žflow-libs/chalk.js.flowβ€Ž

Lines changed: 0 additions & 130 deletions
This file was deleted.

0 commit comments

Comments
Β (0)