Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/nodejs/node into nodeDocs
Browse files Browse the repository at this point in the history
  • Loading branch information
vipul kumar committed Sep 3, 2021
2 parents 3a23620 + c68faa9 commit b8b8401
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@ env:
jobs:
build-windows:
if: github.event.pull_request.draft == false
strategy:
matrix:
windows: [windows-2019, windows-2022]
fail-fast: false
runs-on: ${{ matrix.windows }}
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ env.PYTHON_VERSION }}
Expand Down
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ Nebu Pookins <[email protected]>
Netto Farah <[email protected]>
Nicholas Kinsey <[email protected]>
Nick Soggin <[email protected]> <[email protected]>
Nigel Kibodeaux <[email protected]> <[email protected]>
Nikola Glavina <[email protected]> <[email protected]>
Nikolai Vavilov <[email protected]>
Nils Kuhnhenn <[email protected]>
Expand Down
3 changes: 1 addition & 2 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -1242,7 +1242,7 @@ Dan Villa <[email protected]>
CodeTheInternet <[email protected]>
Eric Gonzalez <[email protected]>
rgoodwin <[email protected]>
Nigel Kibodeaux <[email protected]>
Nigel Kibodeaux <[email protected]>
fmizzell <[email protected]>
cdnadmin <[email protected]>
Paul Lucas <[email protected]>
Expand Down Expand Up @@ -1772,7 +1772,6 @@ Guilherme Akio Sakae <[email protected]>
Martin Michaelis <[email protected]>
Christopher Sidebottom <[email protected]>
Edward Andrew Robinson <[email protected]>
Nigel Kibodeaux <[email protected]>
Shakeel Mohamed <[email protected]>
Tobias Kieslich <[email protected]>
Ruy Adorno <[email protected]>
Expand Down

0 comments on commit b8b8401

Please sign in to comment.