Skip to content

Commit 4e25380

Browse files
committed
Export updated standards, try security delete keychain
1 parent b4b8520 commit 4e25380

23 files changed

+924321
-1615444
lines changed

.github/workflows/app_build.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,11 @@ jobs:
218218
219219
# ----- Configure Keychain -----
220220
KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
221-
rm -f $KEYCHAIN_PATH
221+
if [ -f $KEYCHAIN_PATH ]; then
222+
echo "Removing previous keychain-db at ${KEYCHAIN_PATH}"
223+
security delete-keychain $KEYCHAIN_PATH
224+
rm -f $KEYCHAIN_PATH
225+
fi
222226
security create-keychain -p "${{ secrets.MACOS_KEYCHAIN_PASSWORD }}" $KEYCHAIN_PATH
223227
# Unlock it for 6 hours
224228
security set-keychain-settings -lut 21600 $KEYCHAIN_PATH

.github/workflows/check_osm_versions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
shell: bash
2626
run: |
2727
echo "There is a workflow called export_standards_data that you should run first (it's a manual workflow_dispatch workflow)"
28-
echo "or run it locally via 'cd developper/ruby && openstudio export_openstudio_standards_libraries.rb'"
28+
echo "or run it locally via 'cd developer/ruby && openstudio export_openstudio_standards_libraries.rb'"
2929
echo ""
30-
echo "Then you should use 'openstudio developper/ruby/UpdateOSMVersions.rb' to version translate the rest of the OSM files."
30+
echo "Then you should use 'openstudio developer/ruby/UpdateOSMVersions.rb' to version translate the rest of the OSM files."

developer/ruby/export_openstudio_standards_libraries.rb

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,17 @@ def export_openstudio_standards_libraries
8484
templates = templates - missing_czs
8585
end
8686

87+
pkg_dir = "#{__dir__}/pkg"
88+
Dir.mkdir(pkg_dir) unless Dir.exist?(pkg_dir)
89+
osm_lib_dir = "#{pkg_dir}/libraries"
90+
Dir.mkdir(osm_lib_dir) unless Dir.exist?(osm_lib_dir)
91+
8792
# templates = templates_to_climate_zones.keys
8893
# Make a library model for each template
8994
# We parallelize this loop, since it takes really long
9095
# Note: You DO want to use in_processes here, and not in_threads!
9196
Parallel.each(templates, in_processes: $nproc, progress: 'Exporting openstudio-standards templates') do |template_name|
97+
#templates.each do |template_name|
9298

9399
# Wrap each library creation in a begin/rescue because
94100
# the entire process can take a long time and
@@ -464,10 +470,10 @@ def export_openstudio_standards_libraries
464470
std_applier.space_type_apply_rendering_color(space_type)
465471

466472
# Loads
467-
std_applier.space_type_apply_internal_loads(space_type, true, true, true, true, true, true)
473+
std_applier.space_type_apply_internal_loads(space_type, true, true, true, true, true)
468474

469475
# Schedules
470-
std_applier.space_type_apply_internal_load_schedules(space_type, true, true, true, true, true, true, true)
476+
std_applier.space_type_apply_internal_load_schedules(space_type, true, true, true, true, true, true)
471477

472478
end
473479
end
@@ -505,10 +511,6 @@ def export_openstudio_standards_libraries
505511
end
506512

507513
# Save the library
508-
pkg_dir = "#{__dir__}/pkg"
509-
Dir.mkdir(pkg_dir) unless Dir.exists?(pkg_dir)
510-
osm_lib_dir = "#{pkg_dir}/libraries"
511-
Dir.mkdir(osm_lib_dir) unless Dir.exists?(osm_lib_dir)
512514
library_path = "#{osm_lib_dir}/#{template_name.gsub(/\W/,'_')}.osm"
513515
puts "* Saving library #{library_path}"
514516
model.save(OpenStudio::Path.new(library_path), true)
@@ -526,7 +528,7 @@ def export_openstudio_standards_libraries
526528
rescue Exception => exc
527529
STDERR.puts "\e[0;31;49mERROR creating '#{template_name}', skipping to next template.\e[0m"
528530
STDERR.puts "#{exc}"
529-
STDERR.puts "Backtrace:\n\t#{exc.caller.join("\n\t")}"
531+
#STDERR.puts "Backtrace:\n\t#{exc.caller.join("\n\t")}"
530532
STDERR.puts "Backtrace:\n\t#{exc.backtrace.join("\n\t")}"
531533

532534
# Save the log messages for debugging library creation even on failure

src/openstudio_app/Resources/90_1_2004.osm

Lines changed: 57599 additions & 74476 deletions
Large diffs are not rendered by default.

src/openstudio_app/Resources/90_1_2007.osm

Lines changed: 57648 additions & 74883 deletions
Large diffs are not rendered by default.

src/openstudio_app/Resources/90_1_2010.osm

Lines changed: 58126 additions & 73647 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)