Skip to content

Commit

Permalink
Merge pull request #338 from JarvusInnovations/develop
Browse files Browse the repository at this point in the history
Release: v0.41.14
  • Loading branch information
themightychris committed Apr 6, 2024
2 parents 16ee707 + e226810 commit 190a5a2
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 21 deletions.
5 changes: 3 additions & 2 deletions .studiorc
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
# install dependencies
echo
echo "--> Installing project development dependencies..."
# use jarvus/node20 build until merged: https://github.com/habitat-sh/core-plans/pull/4708
hab pkg install \
jarvus/mkdocs-studio \
jarvus/studio-toolkit \
core/node16 \
jarvus/node20 \
core/git

hab pkg binlink core/node16 core/git
hab pkg binlink jarvus/node20 core/git
hab pkg binlink core/coreutils env --dest /usr/bin


Expand Down
2 changes: 1 addition & 1 deletion github-actions/projector/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ outputs:
commit:
description: 'Commit hash for last projection (if commit-to is configured)'
runs:
using: 'node16'
using: 'node20'
main: 'index.js'
post: 'post.js'
41 changes: 28 additions & 13 deletions package-lock.json

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
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
"async-exit-hook": "^2.0.1",
"axios": "^1.3.3",
"chokidar": "^3.5.3",
"debounce": "^1.2.1",
"debounce": "^2.0.0",
"dockerode": "^4.0.2",
"fb-watchman": "^2.0.1",
"git-client": "^1.8.3",
"hab-client": "^1.1.3",
"handlebars": "^4.7.6",
"minimatch": "^7.4.2",
"minimatch": "^9.0.4",
"mz": "^2.4.0",
"mz-modules": "^2.1.0",
"object-squish": "^1.1.0",
"parse-url": "^8.1.0",
"parse-url": "^9.2.0",
"shell-quote-word": "^1.0.1",
"sort-keys": "^4.2.0",
"toposort": "^2.0.2",
Expand Down
4 changes: 2 additions & 2 deletions plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pkg_build_deps=(

pkg_deps=(
core/git
core/node16
"jarvus/node20" # use jarvus build until merged: https://github.com/habitat-sh/core-plans/pull/4708
core/hab/0.79.0 # last version before new license
)

Expand Down Expand Up @@ -39,7 +39,7 @@ do_build() {
npm install

build_line "Fixing interpreter"
sed -e "s#\#\!/usr/bin/env node#\#\!$(pkg_path_for node16)/bin/node#" --in-place "node-bin/cli.js"
sed -e "s#\#\!/usr/bin/env node#\#\!$(pkg_path_for node20)/bin/node#" --in-place "node-bin/cli.js"

popd > /dev/null
}
Expand Down

0 comments on commit 190a5a2

Please sign in to comment.