Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
90fb544
:arrow_up: npm
smashwilson Nov 17, 2019
365acd3
Back out the changes from #673
smashwilson Nov 17, 2019
8c43223
:fire: remaining python-interceptor reference
smashwilson Nov 17, 2019
b78683b
Use npm ci instead of npm install
smashwilson Nov 17, 2019
20de1d3
`--loglevel silly` to see what's up
smashwilson Nov 21, 2019
0549175
Merge branch 'master' of github.com:atom/apm into upgrade-node-gyp
smashwilson Apr 4, 2020
71f50cd
:arrow_up: npm
smashwilson Apr 4, 2020
45c9d91
back to npm install I guess?
smashwilson Apr 4, 2020
3078e03
"prepublish" step is deprecated
smashwilson Apr 4, 2020
4dae606
Let's see if the dedupe is messing it up
smashwilson Apr 4, 2020
a0a2e01
No matrix
smashwilson Apr 4, 2020
019d816
Actually rename the npm task
smashwilson Apr 4, 2020
cc33759
Well that didn't help
smashwilson Apr 4, 2020
03a0f2e
Upgrade npm first
smashwilson Apr 4, 2020
6765c77
Okay still npm install
smashwilson Apr 4, 2020
fe6c3ce
package-lock.json: Fix misformed URL
DeeDeeG Apr 29, 2020
97b05cd
package-lock: Restore missing dependencies
DeeDeeG Apr 28, 2020
dead3c3
install_spec.coffee: Use deduped node-gyp path
DeeDeeG Apr 28, 2020
208d982
BUNDLED_NODE_VERSION: Bump bundled Node to v10.20.1
DeeDeeG Apr 30, 2020
77227d8
spec: Update node tarball/libs to v10.20.1
DeeDeeG May 1, 2020
ed6e03d
install-spec: Delete "configurable python" tests
DeeDeeG May 5, 2020
7a29a08
:fire: fake-python-[1,2].sh
DeeDeeG May 5, 2020
fff0890
install-spec: Delete 'with a space' after test
DeeDeeG May 5, 2020
e2efbd5
CI: Update Node from 10.2.1 to 10.20.1
DeeDeeG May 5, 2020
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
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ notifications:
on_failure: change

node_js:
- "10.2.1"
- "10.20.1"

before_install: npm install -g npm

install: npm install

script: ./bin/npm test

Expand Down
2 changes: 1 addition & 1 deletion BUNDLED_NODE_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v10.2.1
v10.20.1
2 changes: 1 addition & 1 deletion Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ module.exports = (grunt) ->
grunt.registerTask('lint', ['coffeelint'])
grunt.registerTask('default', ['coffee', 'lint'])
grunt.registerTask('test', ['clean', 'default', 'shell:test'])
grunt.registerTask('prepublish', ['clean', 'coffee', 'lint'])
grunt.registerTask('prepare', ['clean', 'coffee', 'lint'])
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ platform:
- x64

environment:
nodejs_version: "10.2.1"
nodejs_version: "10.20.1"

install:
- ps: Install-Product node $env:nodejs_version $env:platform
- npm install -g npm
- npm install
- npm ci

build: off

Expand Down
12 changes: 0 additions & 12 deletions bin/apm
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,6 @@ binDir=`pwd -P`
# Force npm to use its builtin node-gyp
unset npm_config_node_gyp

export ATOM_APM_ORIGINAL_PYTHON="${PYTHON:-}"

# Assumption: env iterates through environment variables in the same order that
# process.env iterates through properties within npm. So, we take the last match.
for var in $(env | grep -i ^npm_config_python=)
do
ATOM_APM_ORIGINAL_PYTHON="${var#*=}"
unset ${var%%=*}
done

export npm_config_python="${binDir}/python-interceptor.sh"

cliPath="$binDir/../lib/cli.js"
if [[ $(uname -r) == *-Microsoft ]]; then
cliPath="$(echo $cliPath | sed 's/\/mnt\/\([a-z]*\)\(.*\)/\1:\2/')"
Expand Down
15 changes: 0 additions & 15 deletions bin/npm
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,4 @@ export PATH="$SCRIPT_DIR:$PATH"
# Force npm to use its builtin node-gyp
unset npm_config_node_gyp

export ATOM_APM_ORIGINAL_PYTHON="${PYTHON:-}"

# Assumption: env iterates through environment variables in the same order that
# process.env iterates through properties within npm. So, we take the last match.
for var in $(env | grep -i ^npm_config_python=)
do
ATOM_APM_ORIGINAL_PYTHON="${var#*=}"
done
if [ -z "${ATOM_APM_ORIGINAL_PYTHON}" ] && [ -n "${PYTHON:-}" ]
then
ATOM_APM_ORIGINAL_PYTHON="${PYTHON}"
fi

export npm_config_python="${SCRIPT_DIR}/python-interceptor.sh"

"$SCRIPT_DIR"/../node_modules/.bin/npm $@
42 changes: 0 additions & 42 deletions bin/python-interceptor.sh

This file was deleted.

Loading