From 4c2e715c6e1b14f488d63cc7ee791769b9bcc4ab Mon Sep 17 00:00:00 2001
From: John Eslick <john.eslick@netl.doe.gov>
Date: Thu, 5 May 2022 14:11:16 -0500
Subject: [PATCH] Add release hashes for 2.6.1

---
 doc/build_macos.md             |  4 ++++
 docker/build-platform/build.sh |  2 +-
 docker/test-platform/build.sh  |  2 +-
 releases/sha256sum_2.6.1.txt   | 33 +++++++++++++++++++++++++++++++++
 scripts/compile_solvers.sh     |  6 ++++++
 scripts/docker_linux_tests.py  |  3 +--
 6 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 releases/sha256sum_2.6.1.txt

diff --git a/doc/build_macos.md b/doc/build_macos.md
index e83b0d73..af596780 100644
--- a/doc/build_macos.md
+++ b/doc/build_macos.md
@@ -12,6 +12,10 @@ Preliminary Setup
   * brew install gcc
   * brew install pkgconfig
   * brew install boost
+5. Build PETSc (no mpi)
+  * download https://petsc.org/release/download/
+  * extract in ~/src
+  * ./configure --with-debug=0 --with-shared=0 --with-mpi=0 --with-fortran-bindings=0 --download-metis --download-mumps --with-mumps-serial=1 --prefix=$HOME/src/petsc-dist
 Build extensions
 5. Get idaes-ext (clone or download from github)
 6. If you have the HSL, put the coinhsl.zip file in the same directory as
diff --git a/docker/build-platform/build.sh b/docker/build-platform/build.sh
index 1dbc432c..7f3efcb2 100644
--- a/docker/build-platform/build.sh
+++ b/docker/build-platform/build.sh
@@ -18,5 +18,5 @@ else
 fi
 
 cd "$flavor"
-docker build -t "$image" .
+docker build --no-cache -t "$image" .
 cd ..
diff --git a/docker/test-platform/build.sh b/docker/test-platform/build.sh
index 65d4b65b..0fad6411 100644
--- a/docker/test-platform/build.sh
+++ b/docker/test-platform/build.sh
@@ -1,5 +1,5 @@
 flavor=$1
 image="idaes-ext-${flavor}-test:latest"
 cd "$flavor"
-docker build -t "$image" .
+docker build --no-cache -t "$image" .
 cd ..
diff --git a/releases/sha256sum_2.6.1.txt b/releases/sha256sum_2.6.1.txt
new file mode 100644
index 00000000..081f76cf
--- /dev/null
+++ b/releases/sha256sum_2.6.1.txt
@@ -0,0 +1,33 @@
+844d8f63b069b483394b140c65872781207085a0ac887e7df11d6cf8b6f87933  idaes-solvers-darwin-aarch64.tar.gz
+c474a67d485151654e84df58a7ed3f703ba076f2f6275a8a9c5f735d9fe4be22  idaes-lib-darwin-aarch64.tar.gz
+434aa9399b0e05e89359de48ea0643e7fd4682f83092b35d268ee26257ccc48e  idaes-solvers-el7-x86_64.tar.gz
+dea03d0c07438073fca07bad83103d9b0b283b7c63c3e878e8ff3a4916d40b5e  idaes-lib-el7-x86_64.tar.gz
+d701b9ebc0e14cbe7b9f925f61dee2dd455ddc09e79b9eaa3ef7f0fd83bc0380  idaes-solvers-el8-x86_64.tar.gz
+4a8e4af47acab71ec4957829e66e41ca866c4c1a9d5aabdfee8949a60931b8af  idaes-lib-el8-x86_64.tar.gz
+78f3c39f380b456580fb0e14828f1a4a1c9f63a1ef91031c744b1d549e0773f5  idaes-solvers-el8-aarch64.tar.gz
+1209380e22a506f3d42ae251c2cb2f5017974e0b77f5fb30e123905a237319b1  idaes-lib-el8-aarch64.tar.gz
+6ead3688b178f732fa31fe93c68ecc452671e673a30a89fc972d55657b3bf724  idaes-solvers-ubuntu1804-x86_64.tar.gz
+8a6aff423f80f05f590a327937e465c0b5f62b5a84c7a533b57497cbfc3df106  idaes-lib-ubuntu1804-x86_64.tar.gz
+96c954f455868bb448b1b2dd7f786aaaa890d4069cd5e077195d701c626f2685  idaes-solvers-ubuntu1804-aarch64.tar.gz
+cce3baf9bf0a2f4d5372351a5a81a9210ce85f96c14574a0da52afd2aed0654d  idaes-lib-ubuntu1804-aarch64.tar.gz
+a0e987c546357fdea69ca080cf1613607142ef251a87bf0eb2e78055371ffa9f  idaes-solvers-ubuntu2004-x86_64.tar.gz
+2d448bb5c69a902ac2b6272a9de9d03c10a279fd55e8b7f3455f6f15baf9f112  idaes-lib-ubuntu2004-x86_64.tar.gz
+f2f4bdda37b1d0470159b5255db9d1ddc606b66c62409f37eabdbc0e7f36f1c2  idaes-solvers-ubuntu2004-aarch64.tar.gz
+11e3b5468c1ca841a00cec8c5ea003bd3939f103fef415f265e762c3a404c3a1  idaes-lib-ubuntu2004-aarch64.tar.gz
+f5fa3643062063e2233359e1a7cf65051b5733642a9307e38b3aba81fed5458d  idaes-solvers-ubuntu2204-x86_64.tar.gz
+53eecbfcf02ce0c710bd03354740cb67c9805d907506f2154f1f9636a45118f1  idaes-lib-ubuntu2204-x86_64.tar.gz
+d0a045caaf8a373731941137746110e80af3487e2ef9d4295148e2b1484aba9c  idaes-solvers-ubuntu2204-aarch64.tar.gz
+f0a47af451e6bea38a354b71554f12ba37592504df12fa5568177d979cfea2fc  idaes-lib-ubuntu2204-aarch64.tar.gz
+50ebabc8fd084402178e63d8290d85559627b53229dfa3c6ebf598d0b0b59efc  idaes-solvers-windows-x86_64.tar.gz
+e9219a9c87c06aa35410db6f7ea9d7ac820a62b7ae4dd14edc9ffe04094b5796  idaes-lib-windows-x86_64.tar.gz
+bd2306de01a79da2afedfb45e0b57406e02b731bb311dd8976f510d569223e32  idaes-petsc-darwin-aarch64.tar.gz
+b933242dd7c64e735040e625c91c430bfc34cbee7187f27ab42c9b8bf62132cd  idaes-petsc-el7-x86_64.tar.gz
+ee3ae758ccee4740fefb0ad3fd032becc3a5f95909810a5211a68249cc6eeb61  idaes-petsc-el8-x86_64.tar.gz
+fbe5d2f20e5b13b6b27bad9d5a9a4accc7265bdc9e37a37e4728fd308bd29004  idaes-petsc-el8-aarch64.tar.gz
+4e5d1753cad0d44f6f4f35bb339d7c23d0d964a2093d12b0a26ee9947057138b  idaes-petsc-ubuntu1804-x86_64.tar.gz
+7e3173e8035c4f8099099a097d59ec8846753fc47ca9bd82af43bde3d8ad4247  idaes-petsc-ubuntu1804-aarch64.tar.gz
+0f80513097ae83f48fb446bd8ebb9293935cd57b52fa8e985924c71f71aac45c  idaes-petsc-ubuntu2004-x86_64.tar.gz
+990ec1c23757fa5746be6027dabec533815e7355ba2bdf471688af109fcaa25e  idaes-petsc-ubuntu2004-aarch64.tar.gz
+c164950470ff3a6d20ef19f0870973485eff1840ff80ddc7d1fa3a5cee9e8060  idaes-petsc-ubuntu2204-x86_64.tar.gz
+5494f4bd763ba204d4e29eb3b952208c95d7fbad885ddd2d22c9a074c4c87adc  idaes-petsc-ubuntu2204-aarch64.tar.gz
+d7e10846650d2668a4fe2b384b0f7658e472dfdb8eb201d7ef53b88a4a61e9a0  idaes-petsc-windows-x86_64.tar.gz
diff --git a/scripts/compile_solvers.sh b/scripts/compile_solvers.sh
index e83fc7ca..fbaf5435 100644
--- a/scripts/compile_solvers.sh
+++ b/scripts/compile_solvers.sh
@@ -394,6 +394,12 @@ fi
 echo "#########################################################################"
 echo "# Pynumero                                                              #"
 echo "#########################################################################"
+
+if [ ${osname} = "darwin" ]; then
+  export CC="cc"
+  export CXX="c++"
+fi
+
 cd $IDAES_EXT
 git clone $PYNU_REPO
 cd pyomo
diff --git a/scripts/docker_linux_tests.py b/scripts/docker_linux_tests.py
index 3cfe3bb3..8e7de7c9 100644
--- a/scripts/docker_linux_tests.py
+++ b/scripts/docker_linux_tests.py
@@ -5,9 +5,8 @@
 
 docker exec test /bin/bash -c 'cd repo
     eval "$(/root/miniconda/bin/conda shell.bash hook)"
-    git clone https://github.com/eslickj/idaes-pse.git
+    git clone https://github.com/idaes/idaes-pse.git
     cd idaes-pse
-    git checkout newbin
     conda create -n idaes python=3.9 pip psutil
     conda activate idaes
     pip install -e .