diff --git a/.github/workflows/docker-openstudio.yml b/.github/workflows/docker-openstudio.yml index 2271e4d..616d7da 100644 --- a/.github/workflows/docker-openstudio.yml +++ b/.github/workflows/docker-openstudio.yml @@ -10,9 +10,9 @@ on: [push, pull_request] env: USE_TESTING_TIMEOUTS: "true" - OPENSTUDIO_VERSION: 3.7.0 - OPENSTUDIO_SHA: d5269793f1 - OPENSTUDIO_VERSION_EXT: "" + OPENSTUDIO_VERSION: 3.8.0 + OPENSTUDIO_SHA: d8eac889d0 + OPENSTUDIO_VERSION_EXT: "-rc3" jobs: @@ -27,7 +27,7 @@ jobs: - name: test and build shell: bash run: | - docker build --target base -t openstudio:latest \ + docker build -t openstudio:latest \ --build-arg OPENSTUDIO_VERSION=$OPENSTUDIO_VERSION \ --build-arg OPENSTUDIO_SHA=$OPENSTUDIO_SHA \ --build-arg OPENSTUDIO_VERSION_EXT=$OPENSTUDIO_VERSION_EXT \ diff --git a/.github/workflows/manual_installer_test.yml b/.github/workflows/manual_installer_test.yml index 00d002f..9d48d0c 100644 --- a/.github/workflows/manual_installer_test.yml +++ b/.github/workflows/manual_installer_test.yml @@ -1,4 +1,4 @@ -name: Build, test and deploy Docker image +name: manual_update_develop on: workflow_dispatch: diff --git a/Dockerfile b/Dockerfile index 98e3ab9..b94c2ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,11 +3,12 @@ FROM ubuntu:20.04 AS base MAINTAINER Nicholas Long nicholas.long@nrel.gov # Set the version of OpenStudio when building the container. For example `docker build --build-arg -ARG OPENSTUDIO_VERSION=3.7.0 -ARG OPENSTUDIO_VERSION_EXT="" -ARG OPENSTUDIO_DOWNLOAD_URL=https://github.com/NREL/OpenStudio/releases/download/v3.7.0/OpenStudio-3.7.0+d5269793f1-Ubuntu-20.04-x86_64.deb -ENV OS_BUNDLER_VERSION=2.1.4 -ENV RUBY_VERSION=2.7.2 +ARG OPENSTUDIO_VERSION=3.8.0 +ARG OPENSTUDIO_VERSION_EXT="-rc3" +ARG OPENSTUDIO_DOWNLOAD_URL=https://openstudio-ci-builds.s3.amazonaws.com/develop/OpenStudio-3.8.0-rc3%2Bd8eac889d0-Ubuntu-20.04-x86_64.deb +ENV RC_RELEASE=TRUE +ENV OS_BUNDLER_VERSION=2.4.10 +ENV RUBY_VERSION=3.2.2 ENV BUNDLE_WITHOUT=native_ext # Install gdebi, then download and install OpenStudio, then clean up. # gdebi handles the installation of OpenStudio's dependencies @@ -31,23 +32,23 @@ RUN apt-get update && apt-get install -y \ && OPENSTUDIO_DOWNLOAD_FILENAME=$(ls *.deb) \ # Verify that the download was successful (not access denied XML from s3) && grep -v -q "AccessDenied" ${OPENSTUDIO_DOWNLOAD_FILENAME} \ - && gdebi -n $OPENSTUDIO_DOWNLOAD_FILENAME + && gdebi -n $OPENSTUDIO_DOWNLOAD_FILENAME \ # Cleanup - RUN rm -f $OPENSTUDIO_DOWNLOAD_FILENAME \ + && rm -f $OPENSTUDIO_DOWNLOAD_FILENAME \ && rm -rf /var/lib/apt/lists/* \ && locale-gen en_US en_US.UTF-8 \ && dpkg-reconfigure locales +RUN apt update && apt install -y libyaml-dev ruby-full # RUN apt-get install ca-certificates -# RUN curl -k -SLO https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.2.tar.gz \ - -RUN curl -SLO -k https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.2.tar.gz \ - && tar -xvzf ruby-2.7.2.tar.gz \ - && cd ruby-2.7.2 \ +RUN pwd +RUN curl -SLO -k https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.2.tar.gz \ + && tar -xvzf ruby-3.2.2.tar.gz \ + && cd ruby-3.2.2 \ && ./configure \ && make && make install - +RUN rm -rf ruby* ## Add RUBYLIB link for openstudio.rb ENV RUBYLIB=/usr/local/openstudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}/Ruby ENV ENERGYPLUS_EXE_PATH=/usr/local/openstudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}/EnergyPlus/energyplus diff --git a/test/Gemfile-git b/test/Gemfile-git index 9e6d6d7..dfdb763 100644 --- a/test/Gemfile-git +++ b/test/Gemfile-git @@ -1,6 +1,5 @@ source 'http://rubygems.org' -gem 'xml-simple' gem 'openstudio-standards', github: 'nrel/openstudio-standards', branch: 'ambient-loop' gem 'tilt', github: 'rtomayko/tilt', ref: 'abe77eaf1b5f8da0a7e46135f' -gem 'json_pure', '~> 2.1' \ No newline at end of file +gem 'json_pure', '~> 2.1'