Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/v2' into wbinnssmith/merge-v2-…
Browse files Browse the repository at this point in the history
…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)
  • Loading branch information
lettertwo committed Apr 29, 2022
2 parents a698387 + 50893a7 commit aae3521
Show file tree
Hide file tree
Showing 25 changed files with 480 additions and 456 deletions.
2 changes: 1 addition & 1 deletion .flowconfig
Expand Up @@ -36,4 +36,4 @@ untyped-import
untyped-type-import

[version]
0.175.1
0.176.3
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Expand Up @@ -42,7 +42,7 @@ jobs:
name: Unit tests (${{matrix.os}}, Node ${{matrix.node}})
strategy:
matrix:
node: [12, 14]
node: [14, 16]
os: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{matrix.os}}
steps:
Expand All @@ -64,8 +64,11 @@ jobs:
name: Integration tests (${{matrix.os}}, Node ${{matrix.node}})
strategy:
matrix:
node: [12, 14]
node: [14, 16]
os: [ubuntu-latest, macos-latest, windows-latest]
# These tend to be quite flakey, so one failed instance shouldn't stop
# others from potentially succeeding
fail-fast: false
runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v2
Expand Down
101 changes: 89 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

130 changes: 0 additions & 130 deletions flow-libs/chalk.js.flow

This file was deleted.

0 comments on commit aae3521

Please sign in to comment.