move to release of OS 3.9 with ARM

NREL · Nov 21, 2024 · 9cd7d57 · 9cd7d57
1 parent a21ae9a
commit 9cd7d57
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -53,7 +53,7 @@ jobs:
           context: .
           push: true
           target: alfalfa-dependencies
-          platforms: linux/amd64
+          platforms: linux/amd64, linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.output.labels }}
           cache-from: type=gha

diff --git a/Dockerfile b/Dockerfile
@@ -91,8 +91,8 @@ RUN gnuArch="$(dpkg-architecture --query DEB_HOST_ARCH_CPU)"\
   && curl -SfL https://archive.debian.org/debian/pool/main/g/gcc-6/libgfortran3_6.3.0-18+deb9u1_${gnuArch}.deb -o libgfortran3.deb
 
 FROM python:${PYTHON_VERSION}-slim-${DEBIAN_VERSION} AS energyplus-dependencies
-ARG OPENSTUDIO_VERSION=3.9.0-rc2
-ARG OPENSTUDIO_VERSION_SHA=cc1e0bbd6d
+ARG OPENSTUDIO_VERSION=3.9.0
+ARG OPENSTUDIO_VERSION_SHA=c77fbb9569
 ARG ENERGYPLUS_VERSION=24.2.0
 ARG ENERGYPLUS_VERSION_SHA=94a887817b
 
@@ -107,11 +107,7 @@ WORKDIR /artifacts
 RUN set -eux; \
   export gnuArch=x86_64; if [ "$(uname -m)" = "aarch64" ]; then gnuArch=arm64; fi; export gnuArch; \
   curl -SfL https://github.com/NREL/EnergyPlus/releases/download/v${ENERGYPLUS_VERSION}a/EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_VERSION_SHA}-Linux-Ubuntu22.04-${gnuArch}.tar.gz -o energyplus.tar.gz; \
-  curl -SfL http://openstudio-ci-builds.s3-website-us-west-2.amazonaws.com/PR-5298/OpenStudio-3.9.0-rc2%2Bf332d4f661-Ubuntu-22.04-x86_64.deb -o openstudio.deb
-
-RUN set -eux; \
-  mkdir -p EnergyPlus; \
-  tar -C EnergyPlus --strip-components=1 -xzf energyplus.tar.gz
+  curl -SfL https://github.com/NREL/OpenStudio/releases/download/v${OPENSTUDIO_VERSION}/OpenStudio-${OPENSTUDIO_VERSION}+${OPENSTUDIO_VERSION_SHA}-Ubuntu-22.04-${gnuArch}.deb -o openstudio.deb
 
 FROM python:${PYTHON_VERSION}-slim-${DEBIAN_VERSION} AS alfalfa-dependencies
 
@@ -123,7 +119,7 @@ WORKDIR /artifacts
 # Install EnergyPlus
 RUN --mount=type=bind,from=energyplus-dependencies,source=/artifacts,target=/artifacts set -eux; \
   mkdir -p ${ENERGYPLUS_DIR}; \
-  cp -r /artifacts/EnergyPlus/* ${ENERGYPLUS_DIR}; \
+  tar -C $ENERGYPLUS_DIR/ --strip-components=1 -xzf energyplus.tar.gz; \
   cd ${ENERGYPLUS_DIR}; \
   cp -n -r ${ENERGYPLUS_DIR}/python_lib/* /usr/local/lib/python3.12; \
   rm -rf \
@@ -156,7 +152,6 @@ RUN --mount=type=bind,from=energyplus-dependencies,source=/artifacts,target=/art
     *Release_Notes*.pdf \
   ; \
   ln -s ${ENERGYPLUS_DIR} EnergyPlus; \
-  find /usr/local/openstudio* -type f -regex ".+?\.so.?.*" | xargs -I'{}' strip --strip-unneeded '{}'; \
   apt-get purge -y \
     gdebi-core \
     binutils \