Skip to content

Commit

Permalink
Merge branch 'master' into enable-slow
Browse files Browse the repository at this point in the history
  • Loading branch information
jwagantall authored Nov 14, 2024
2 parents f2cabf7 + 0641363 commit 74cb315
Show file tree
Hide file tree
Showing 25 changed files with 731 additions and 93 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
blank_issues_enabled: false
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
---
name: File an issue…
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

<!-- Thank you for being interested in nvm! Please help us by filling out the following form if you‘re having trouble. If you have a feature request, or some other question, please feel free to clear out the form. Thanks! -->

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: urchin tests

on: [pull_request, push]
on: [push, pull_request]

permissions:
contents: read
Expand Down
8 changes: 8 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,11 @@ Co-authored-by: Name Here <email@here>

# Where can I ask for help?
If you have any questions, please contact [@LJHarb](mailto:ljharb@gmail.com).

# Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:
- The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or
- The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or
- The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it.
- I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved.
10 changes: 5 additions & 5 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -296,17 +296,17 @@ nvm_detect_profile() {
DETECTED_PROFILE="$HOME/.bash_profile"
fi
elif [ "${SHELL#*zsh}" != "$SHELL" ]; then
if [ -f "$HOME/.zshrc" ]; then
DETECTED_PROFILE="$HOME/.zshrc"
elif [ -f "$HOME/.zprofile" ]; then
DETECTED_PROFILE="$HOME/.zprofile"
if [ -f "${ZDOTDIR:-${HOME}}/.zshrc" ]; then
DETECTED_PROFILE="${ZDOTDIR:-${HOME}}/.zshrc"
elif [ -f "${ZDOTDIR:-${HOME}}/.zprofile" ]; then
DETECTED_PROFILE="${ZDOTDIR:-${HOME}}/.zprofile"
fi
fi

if [ -z "$DETECTED_PROFILE" ]; then
for EACH_PROFILE in ".profile" ".bashrc" ".bash_profile" ".zprofile" ".zshrc"
do
if DETECTED_PROFILE="$(nvm_try_profile "${HOME}/${EACH_PROFILE}")"; then
if DETECTED_PROFILE="$(nvm_try_profile "${ZDOTDIR:-${HOME}}/${EACH_PROFILE}")"; then
break
fi
done
Expand Down
1 change: 1 addition & 0 deletions test/fast/Unit tests/mocks/LTS_names.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
jod
iron
hydrogen
gallium
Expand Down
2 changes: 1 addition & 1 deletion test/fast/Unit tests/mocks/lts-star.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/iron
lts/jod
48 changes: 48 additions & 0 deletions test/fast/Unit tests/mocks/nodejs.org-dist-index.tab

Large diffs are not rendered by default.

379 changes: 349 additions & 30 deletions test/fast/Unit tests/mocks/nodejs.org-download-nightly-index.tab

Large diffs are not rendered by default.

26 changes: 24 additions & 2 deletions test/fast/Unit tests/mocks/nvm ls-remote lts.txt
Original file line number Diff line number Diff line change
Expand Up @@ -208,5 +208,27 @@
v18.17.1  (LTS: Hydrogen)
v18.18.0  (LTS: Hydrogen)
v18.18.1  (LTS: Hydrogen)
v18.18.2  (Latest LTS: Hydrogen)
v20.9.0  (Latest LTS: Iron)
v18.18.2  (LTS: Hydrogen)
v18.19.0  (LTS: Hydrogen)
v18.19.1  (LTS: Hydrogen)
v18.20.0  (LTS: Hydrogen)
v18.20.1  (LTS: Hydrogen)
v18.20.2  (LTS: Hydrogen)
v18.20.3  (LTS: Hydrogen)
v18.20.4  (Latest LTS: Hydrogen)
v20.9.0  (LTS: Iron)
v20.10.0  (LTS: Iron)
v20.11.0  (LTS: Iron)
v20.11.1  (LTS: Iron)
v20.12.0  (LTS: Iron)
v20.12.1  (LTS: Iron)
v20.12.2  (LTS: Iron)
v20.13.0  (LTS: Iron)
v20.13.1  (LTS: Iron)
v20.14.0  (LTS: Iron)
v20.15.0  (LTS: Iron)
v20.15.1  (LTS: Iron)
v20.16.0  (LTS: Iron)
v20.17.0  (LTS: Iron)
v20.18.0  (Latest LTS: Iron)
v22.11.0  (Latest LTS: Jod)
52 changes: 50 additions & 2 deletions test/fast/Unit tests/mocks/nvm ls-remote node.txt
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,14 @@
v18.17.1  (LTS: Hydrogen)
v18.18.0  (LTS: Hydrogen)
v18.18.1  (LTS: Hydrogen)
v18.18.2  (Latest LTS: Hydrogen)
v18.18.2  (LTS: Hydrogen)
v18.19.0  (LTS: Hydrogen)
v18.19.1  (LTS: Hydrogen)
v18.20.0  (LTS: Hydrogen)
v18.20.1  (LTS: Hydrogen)
v18.20.2  (LTS: Hydrogen)
v18.20.3  (LTS: Hydrogen)
v18.20.4  (Latest LTS: Hydrogen)
v19.0.0
v19.0.1
v19.1.0
Expand All @@ -706,6 +713,47 @@
v20.7.0
v20.8.0
v20.8.1
v20.9.0  (Latest LTS: Iron)
v20.9.0  (LTS: Iron)
v20.10.0  (LTS: Iron)
v20.11.0  (LTS: Iron)
v20.11.1  (LTS: Iron)
v20.12.0  (LTS: Iron)
v20.12.1  (LTS: Iron)
v20.12.2  (LTS: Iron)
v20.13.0  (LTS: Iron)
v20.13.1  (LTS: Iron)
v20.14.0  (LTS: Iron)
v20.15.0  (LTS: Iron)
v20.15.1  (LTS: Iron)
v20.16.0  (LTS: Iron)
v20.17.0  (LTS: Iron)
v20.18.0  (Latest LTS: Iron)
v21.0.0
v21.1.0
v21.2.0
v21.3.0
v21.4.0
v21.5.0
v21.6.0
v21.6.1
v21.6.2
v21.7.0
v21.7.1
v21.7.2
v21.7.3
v22.0.0
v22.1.0
v22.2.0
v22.3.0
v22.4.0
v22.4.1
v22.5.0
v22.5.1
v22.6.0
v22.7.0
v22.8.0
v22.9.0
v22.10.0
v22.11.0  (Latest LTS: Jod)
v23.0.0
v23.1.0
52 changes: 50 additions & 2 deletions test/fast/Unit tests/mocks/nvm ls-remote.txt
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,14 @@
v18.17.1  (LTS: Hydrogen)
v18.18.0  (LTS: Hydrogen)
v18.18.1  (LTS: Hydrogen)
v18.18.2  (Latest LTS: Hydrogen)
v18.18.2  (LTS: Hydrogen)
v18.19.0  (LTS: Hydrogen)
v18.19.1  (LTS: Hydrogen)
v18.20.0  (LTS: Hydrogen)
v18.20.1  (LTS: Hydrogen)
v18.20.2  (LTS: Hydrogen)
v18.20.3  (LTS: Hydrogen)
v18.20.4  (Latest LTS: Hydrogen)
v19.0.0
v19.0.1
v19.1.0
Expand All @@ -747,6 +754,47 @@
v20.7.0
v20.8.0
v20.8.1
v20.9.0  (Latest LTS: Iron)
v20.9.0  (LTS: Iron)
v20.10.0  (LTS: Iron)
v20.11.0  (LTS: Iron)
v20.11.1  (LTS: Iron)
v20.12.0  (LTS: Iron)
v20.12.1  (LTS: Iron)
v20.12.2  (LTS: Iron)
v20.13.0  (LTS: Iron)
v20.13.1  (LTS: Iron)
v20.14.0  (LTS: Iron)
v20.15.0  (LTS: Iron)
v20.15.1  (LTS: Iron)
v20.16.0  (LTS: Iron)
v20.17.0  (LTS: Iron)
v20.18.0  (Latest LTS: Iron)
v21.0.0
v21.1.0
v21.2.0
v21.3.0
v21.4.0
v21.5.0
v21.6.0
v21.6.1
v21.6.2
v21.7.0
v21.7.1
v21.7.2
v21.7.3
v22.0.0
v22.1.0
v22.2.0
v22.3.0
v22.4.0
v22.4.1
v22.5.0
v22.5.1
v22.6.0
v22.7.0
v22.8.0
v22.9.0
v22.10.0
v22.11.0  (Latest LTS: Jod)
v23.0.0
v23.1.0
1 change: 1 addition & 0 deletions test/fast/Unit tests/mocks/nvm_ls_remote LTS nightly.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ v10.15.3-nightly20190301156e4c8e89 Dubnium
v10.15.4-nightly201905019101d9368f Dubnium
v10.16.2-nightly20190801f025f8524b Dubnium *
v12.22.10-nightly2022012660c9d3bb95 Erbium *
v20.11.0-nightly202312211a0be537da Iron *
26 changes: 24 additions & 2 deletions test/fast/Unit tests/mocks/nvm_ls_remote LTS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -208,5 +208,27 @@ v18.17.0 Hydrogen
v18.17.1 Hydrogen
v18.18.0 Hydrogen
v18.18.1 Hydrogen
v18.18.2 Hydrogen *
v20.9.0 Iron *
v18.18.2 Hydrogen
v18.19.0 Hydrogen
v18.19.1 Hydrogen
v18.20.0 Hydrogen
v18.20.1 Hydrogen
v18.20.2 Hydrogen
v18.20.3 Hydrogen
v18.20.4 Hydrogen *
v20.9.0 Iron
v20.10.0 Iron
v20.11.0 Iron
v20.11.1 Iron
v20.12.0 Iron
v20.12.1 Iron
v20.12.2 Iron
v20.13.0 Iron
v20.13.1 Iron
v20.14.0 Iron
v20.15.0 Iron
v20.15.1 Iron
v20.16.0 Iron
v20.17.0 Iron
v20.18.0 Iron *
v22.11.0 Jod *
5 changes: 4 additions & 1 deletion test/fast/Unit tests/mocks/nvm_ls_remote nightly.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,8 @@ v18.0.0-nightly20220419bde889bd4e
v19.0.0-nightly202210182672219b78
v20.0.0-nightly2023041197d3912eb8
v20.7.0-nightly202309173557c436181c526f41bb6ce7751e63f36695aa1d
v20.11.0-nightly202312211a0be537da Iron *
v21.0.0-nightly202310240fb512344f
v22.0.0-nightly20231025d1ccca9d2b
v22.0.0-nightly20240424ddd0a9e494
v23.0.0-nightly20241016019efe1453
v24.0.0-nightly20241031996708042b
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v22.0.0-nightly20231025d1ccca9d2b
v24.0.0-nightly20241031996708042b
2 changes: 1 addition & 1 deletion test/fast/Unit tests/mocks/nvm_ls_remote stable.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v21.1.0
v23.1.0
52 changes: 50 additions & 2 deletions test/fast/Unit tests/mocks/nvm_ls_remote.txt
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,14 @@ v18.17.0 Hydrogen
v18.17.1 Hydrogen
v18.18.0 Hydrogen
v18.18.1 Hydrogen
v18.18.2 Hydrogen *
v18.18.2 Hydrogen
v18.19.0 Hydrogen
v18.19.1 Hydrogen
v18.20.0 Hydrogen
v18.20.1 Hydrogen
v18.20.2 Hydrogen
v18.20.3 Hydrogen
v18.20.4 Hydrogen *
v19.0.0
v19.0.1
v19.1.0
Expand All @@ -706,6 +713,47 @@ v20.6.1
v20.7.0
v20.8.0
v20.8.1
v20.9.0 Iron *
v20.9.0 Iron
v20.10.0 Iron
v20.11.0 Iron
v20.11.1 Iron
v20.12.0 Iron
v20.12.1 Iron
v20.12.2 Iron
v20.13.0 Iron
v20.13.1 Iron
v20.14.0 Iron
v20.15.0 Iron
v20.15.1 Iron
v20.16.0 Iron
v20.17.0 Iron
v20.18.0 Iron *
v21.0.0
v21.1.0
v21.2.0
v21.3.0
v21.4.0
v21.5.0
v21.6.0
v21.6.1
v21.6.2
v21.7.0
v21.7.1
v21.7.2
v21.7.3
v22.0.0
v22.1.0
v22.2.0
v22.3.0
v22.4.0
v22.4.1
v22.5.0
v22.5.1
v22.6.0
v22.7.0
v22.8.0
v22.9.0
v22.10.0
v22.11.0 Jod *
v23.0.0
v23.1.0
7 changes: 4 additions & 3 deletions test/fast/Unit tests/mocks/nvm_make_alias LTS alias calls.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
lts/*|lts/iron
lts/iron|v20.9.0
lts/hydrogen|v18.18.2
lts/*|lts/jod
lts/jod|v22.11.0
lts/iron|v20.18.0
lts/hydrogen|v18.20.4
lts/gallium|v16.20.2
lts/fermium|v14.21.3
lts/erbium|v12.22.12
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22.0
24.0
Original file line number Diff line number Diff line change
@@ -1 +1 @@
21.1
23.1
Loading

0 comments on commit 74cb315

Please sign in to comment.