Skip to content

Commit e321e40

Browse files
committed
Merge remote-tracking branch 'avtar/GPII-1826'
* avtar/GPII-1826: GPII-1826: Removes unnecessary deduping step GPII-1826: Switches Node.js to 32-bit version
2 parents a6725ae + 57eacb7 commit e321e40

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

Vagrantfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,5 @@ Vagrant.configure(2) do |config|
3737
config.vm.provision "shell", path: "provisioning/chocolatey-packages.bat"
3838
config.vm.provision "shell", path: "provisioning/npm-packages.bat"
3939
config.vm.provision "shell", path: "provisioning/build.bat"
40-
config.vm.provision "shell", path: "provisioning/universal.bat"
4140

4241
end

provisioning/build.bat

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
cd c:\vagrant
2-
npm install
2+
call npm install
3+
4+
mkdir c:\node_modules
5+
cd c:\node_modules
6+
git clone --depth 1 https://github.com/GPII/universal.git
7+
cd universal
8+
call npm install
39

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
choco install nodejs.install -version 4.4.3 -y
1+
choco install nodejs.install -version 4.4.3 --forcex86 -y
22
choco install python2 -y
3-
setx /M PATH "%PATH%;C:\Program Files\nodejs;C:\tools\python2"
3+
setx /M PATH "%PATH%;C:\Program Files (x86)\nodejs;C:\tools\python2"
4+

provisioning/universal.bat

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)