Skip to content

Commit b6c789b

Browse files
committed
Merge branch 'topic/npm-offline-mode' into 'master'
Do not attempt installs and license check in offline mode See merge request eng/ide/ada_language_server!1240
2 parents c149e0b + fc050e2 commit b6c789b

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,13 @@ clean:
122122
-rm -rf integration/vscode/ada/$(PLATFORM)
123123

124124
vscode:
125-
cd integration/vscode/ada; LD_LIBRARY_PATH= npm install --no-audit && npm run check-licenses && npm run compile
125+
ifneq ($(npm_config_offline),true)
126+
# These commands may try to contact remote servers so if npm is configured to
127+
# run in offline mode, don't bother running them
128+
cd integration/vscode/ada; LD_LIBRARY_PATH= npm install --no-audit
129+
cd integration/vscode/ada; LD_LIBRARY_PATH= npm run check-licenses
130+
endif
131+
cd integration/vscode/ada; LD_LIBRARY_PATH= npm run compile
126132
@echo Now run:
127133
@echo code --extensionDevelopmentPath=`pwd`/integration/vscode/ada/ `pwd`
128134

0 commit comments

Comments
 (0)