Merge branch 'dev' of https://github.com/NREL/pysam into dev

NREL · Mar 15, 2024 · beda86e · beda86e
2 parents d7b978f + 51d97cc
commit beda86e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/build_manylinux.sh b/build_manylinux.sh
@@ -11,7 +11,7 @@ cd /io/build_linux_ssc
 rm -rf *
 cmake ${SSCDIR} -DCMAKE_BUILD_TYPE=Release -DSAM_SKIP_TOOLS=1 -DSAMAPI_EXPORT=1 -DSAM_SKIP_TESTS=1 ../ssc || exit
 cmake --build . --target shared -j 6 || exit
-cmake --build . --target ssc -j 1 || exit
+cmake --build . --target ssc -j 6 || exit
 
 mkdir -p /io/build_linux_sam
 cd /io/build_linux_sam

diff --git a/build_unix.sh b/build_unix.sh
@@ -49,25 +49,16 @@ if [ "$(python3 -c "import platform; print(platform.processor())")" = "arm" ]
 then
     docker pull quay.io/pypa/manylinux2014_aarch64
     # docker run --rm -dit -v $(pwd):/io quay.io/pypa/manylinux2010_x86_64 /bin/bash
-    docker run --rm -v $(pwd):/io quay.io/pypa/manylinux2014_aarch64 /io/pysam/build_manylinux.sh
-
-    rename -s linux manylinux2014 $PYSAMDIR/dist/*-linux_*
-
-    docker pull continuumio/anaconda3
-    docker run --rm --env PYSAMDIR=/io/pysam -v $(pwd):/io continuumio/anaconda3 /io/pysam/build_conda.sh
+    docker run --rm -v $(pwd):/io quay.io/pypa/manylinux2014_aarch64 /io/pysam/build_manylinux.sh || exit
 else
     docker pull quay.io/pypa/manylinux2014_x86_64
     # docker run --rm -dit -v $(pwd):/io quay.io/pypa/manylinux2014_x86_64 /bin/bash
     docker run --rm -v $(pwd):/io quay.io/pypa/manylinux2014_x86_64 /io/pysam/build_manylinux.sh || exit
-
-    rename -s linux manylinux2014 $PYSAMDIR/dist/*-linux_*
-
-    docker pull continuumio/anaconda
-    docker run --rm --env PYSAMDIR=/io/pysam -v $(pwd):/io continuumio/anaconda /io/pysam/build_conda.sh
 fi
 
 rename -s linux manylinux2014 $PYSAMDIR/dist/*-linux_*
-
+docker pull continuumio/anaconda3
+docker run --rm --env PYSAMDIR=/io/pysam -v $(pwd):/io continuumio/anaconda /io/pysam/build_conda.sh
 
 anaconda upload -u nrel $PYSAMDIR/dist/osx-64/*.tar.bz2
 anaconda upload -u nrel $PYSAMDIR/dist/linux-64/*.tar.bz2