Merge pull request #685 from NREL/fix_windows_artifact

Fix windows artifact build
NREL · Jan 6, 2023 · 7c470f0 · 7c470f0
2 parents 2d15cf4 + 99a90c7
commit 7c470f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/bin/openstudio_meta b/bin/openstudio_meta
@@ -364,7 +364,7 @@ class InstallGems
     end
     sys_cmds << "#{$ruby_path} #{bundler_bin} update"
     sys_cmds << 'echo "Calling assets:precompile"'
-    sys_cmds << "#{$ruby_path} #{rake_bin} assets:precompile" # DLM: consider deleting /server/public/assets each time
+    sys_cmds << "#{$ruby_path} #{bundler_bin} exec #{rake_bin} assets:precompile" # DLM: consider deleting /server/public/assets each time
     sys_call = sys_cmds.join(' && ')
     puts "Environment variables: #{::ENV.inspect}" if options[:debug]
     puts "System call will be: '#{sys_call}' in directory '#{Dir.pwd}'" if options[:debug]

diff --git a/ci/appveyor/build_package.cmd b/ci/appveyor/build_package.cmd
@@ -1,9 +1,11 @@
 REM set PATH=C:\projects\ruby\bin;C:\Program Files\Git\mingw64\bin;C:\projects\openstudio\bin;%PATH%
 set PATH=C:\Ruby27-x64\bin;C:\Program Files\Git\mingw64\bin;C:\projects\openstudio\bin;%PATH%
+set BUNDLE_VERSION=2.1.4
 set GEM_HOME=C:\projects\openstudio-server\gems
 set GEM_PATH=C:\projects\openstudio-server\gems;C:\projects\openstudio-server\gems\gems\bundler\gems
 set RUBYLIB=C:\projects\openstudio\Ruby
 set OPENSTUDIO_TEST_EXE=C:\projects\openstudio\bin\openstudio
+
 REM set mongo_dir??
 cd c:\
 mkdir export