Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release/v6.14.13 #3054

Merged
merged 6 commits into from
Apr 12, 2021
Merged

Release/v6.14.13 #3054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
285ab3f
hosted-git-info@2.8.9
ruyadorno Apr 8, 2021
63b5c56
ssri@6.0.2
ruyadorno Apr 8, 2021
a7b0011
test: fix git init call extra opts
ruyadorno Apr 8, 2021
97a2018
chore: add node14 targets to CI
ruyadorno Apr 9, 2021
b489a1d
docs: changelog for v6.14.13
ruyadorno Apr 8, 2021
a61a7d3
6.14.13
ruyadorno Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [6.x, 8.x, 10.x, 12.x]
node-version: [6.x, 8.x, 10.x, 12.x, 14.x]
os: [ubuntu-latest, windows-latest, macOS-latest]

runs-on: ${{ matrix.os }}
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ os:
- windows

node_js:
- 14
- 12
- 10
- 8
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
## 6.14.13 (2021-04-08)

### DEPENDENCIES

* [`285ab3f65`](https://github.com/npm/cli/commit/285ab3f654882860246f729eb52e2c8c6a6d6e01)
`hosted-git-info@2.8.9`
* [`63b5c56c5`](https://github.com/npm/cli/commit/63b5c56c5203c8965c8ddeff28f2a65010b40b7c)
`ssri@6.0.2`

## 6.14.12 (2021-03-25)

### DEPENDENCIES
Expand Down
10 changes: 10 additions & 0 deletions node_modules/hosted-git-info/CHANGELOG.md
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions node_modules/hosted-git-info/index.js
View file
Open in desktop

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

22 changes: 11 additions & 11 deletions node_modules/hosted-git-info/package.json
View file
Open in desktop

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

10 changes: 10 additions & 0 deletions node_modules/ssri/CHANGELOG.md
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion node_modules/ssri/index.js
View file
Open in desktop

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

25 changes: 13 additions & 12 deletions node_modules/ssri/package.json
View file
Open in desktop

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

14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "6.14.12",
"version": "6.14.13",
"name": "npm",
"description": "a package manager for JavaScript",
"keywords": [
Expand Down Expand Up @@ -63,7 +63,7 @@
"glob": "^7.1.6",
"graceful-fs": "^4.2.4",
"has-unicode": "~2.0.1",
"hosted-git-info": "^2.8.8",
"hosted-git-info": "^2.8.9",
"iferr": "^1.0.2",
"infer-owner": "^1.0.4",
"inflight": "~1.0.6",
Expand Down Expand Up @@ -132,7 +132,7 @@
"slide": "~1.1.6",
"sorted-object": "~2.0.1",
"sorted-union-stream": "~2.1.3",
"ssri": "^6.0.1",
"ssri": "^6.0.2",
"stringify-package": "^1.0.1",
"tar": "^4.4.13",
"text-table": "~0.2.0",
Expand Down
4 changes: 3 additions & 1 deletion test/tap/git-npmignore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ var rimraf = require('rimraf')
var test = require('tap').test
var which = require('which')

var GITHUB_ACTIONS = process.env.GITHUB_ACTIONS
var common = require('../common-tap.js')
var escapeArg = require('../../lib/utils/escape-arg.js')
var Tacks = require('tacks')
Expand Down Expand Up @@ -151,8 +152,9 @@ function setup (cb) {
if (er) return cb(er)

var git = escapeArg(gitPath)
var extraOpts = GITHUB_ACTIONS ? ' --initial-branch=main' : ''

exec(git + ' init --initial-branch=main', {cwd: dep}, init)
exec(git + ' init' + extraOpts, {cwd: dep}, init)

function init (er, _, stderr) {
if (er) return cb(er)
Expand Down