From 26ea06ffc47432b3c434f9ce345d97048cad9094 Mon Sep 17 00:00:00 2001
From: Tim Brooks <41971846+timryanb@users.noreply.github.com>
Date: Tue, 24 Oct 2023 09:24:59 -0400
Subject: [PATCH 1/3] Splitting real/complex build runners to get around GH
 time limit

---
 .github/workflows/deploy_conda_package.yml | 24 +++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy_conda_package.yml b/.github/workflows/deploy_conda_package.yml
index b8e9d54bb..48fde8bf3 100644
--- a/.github/workflows/deploy_conda_package.yml
+++ b/.github/workflows/deploy_conda_package.yml
@@ -23,18 +23,28 @@ jobs:
         include:
           # real versions
           - OS: ubuntu-latest
-            BUILD_DIR: linux-64
+            TARGET: linux-64
+            SCALAR: real
+
+          - OS: macos-latest
+            TARGET: osx-64
+            SCALAR: real
 
           # complex versions
+          - OS: ubuntu-latest
+            TARGET: linux-64
+            SCALAR: complex
+
           - OS: macos-latest
-            BUILD_DIR: osx-64
+            TARGET: osx-64
+            SCALAR: complex
 
-    name: TACS Conda Package Deployment (${{ matrix.OS }})
+    name: TACS Conda Package Deployment (${{ matrix.TARGET }}, ${{ matrix.SCALAR }})
 
     # Recommended if you intend to make multiple deployments in quick succession.
     # This will kill any currently running CI from previous commits to the same branch
     concurrency:
-      group: ci-${{ github.ref }}-${{ matrix.OS }}
+      group: ci-${{ github.ref }}-${{ matrix.TARGET }}-${{ matrix.SCALAR }}
       cancel-in-progress: true
 
     steps:
@@ -62,9 +72,9 @@ jobs:
           export TACS_DIR=${GITHUB_WORKSPACE};
           echo "TACS_DIR=${GITHUB_WORKSPACE}" >> $GITHUB_ENV;
           export ANACONDA_API_TOKEN=${{ secrets.ANACONDA_TOKEN }};
+          export BUILD_ARGS="--no-include-recipe ${{ matrix.EXTRA_ARGS }}";
           conda install anaconda-client conda-build conda-verify -q -y;
           conda config --set anaconda_upload no;
           cd ${TACS_DIR}/conda;
-          conda build --no-include-recipe -c conda-forge -c smdogroup --output-folder . .;
-          anaconda upload --label main ${{ matrix.BUILD_DIR }}/*real*.tar.bz2 --force;
-          anaconda upload --label complex ${{ matrix.BUILD_DIR }}/*complex*.tar.bz2 --force;
+          conda build --variants "{scalar: ${{ matrix.SCALAR }}}" -c conda-forge -c smdogroup $BUILD_ARGS --output-folder . .;
+          anaconda upload --label ${{ matrix.LABEL }}} ${{ matrix.TARGET }}/*.tar.bz2 --force;

From e3221fecfa598fab169b5dffdd7908c1bc702c00 Mon Sep 17 00:00:00 2001
From: Tim Brooks <41971846+timryanb@users.noreply.github.com>
Date: Tue, 24 Oct 2023 12:10:33 -0400
Subject: [PATCH 2/3] Adding label env var

---
 .github/workflows/deploy_conda_package.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy_conda_package.yml b/.github/workflows/deploy_conda_package.yml
index 48fde8bf3..4aa453fb3 100644
--- a/.github/workflows/deploy_conda_package.yml
+++ b/.github/workflows/deploy_conda_package.yml
@@ -73,8 +73,13 @@ jobs:
           echo "TACS_DIR=${GITHUB_WORKSPACE}" >> $GITHUB_ENV;
           export ANACONDA_API_TOKEN=${{ secrets.ANACONDA_TOKEN }};
           export BUILD_ARGS="--no-include-recipe ${{ matrix.EXTRA_ARGS }}";
+          if [[ ${{ matrix.SCALAR }} == "complex" ]]; then
+            export LABEL="complex"
+          elif [[ ${{ matrix.SCALAR }} == "real" ]]; then
+            export LABEL="main"
+          fi
           conda install anaconda-client conda-build conda-verify -q -y;
           conda config --set anaconda_upload no;
           cd ${TACS_DIR}/conda;
           conda build --variants "{scalar: ${{ matrix.SCALAR }}}" -c conda-forge -c smdogroup $BUILD_ARGS --output-folder . .;
-          anaconda upload --label ${{ matrix.LABEL }}} ${{ matrix.TARGET }}/*.tar.bz2 --force;
+          anaconda upload --label LABEL ${{ matrix.TARGET }}/*.tar.bz2 --force;

From ee287730c9f871f470c4bd7b09f091a8d025d2d6 Mon Sep 17 00:00:00 2001
From: Tim Brooks <41971846+timryanb@users.noreply.github.com>
Date: Tue, 24 Oct 2023 15:24:29 -0400
Subject: [PATCH 3/3] Minor edit

---
 .github/workflows/deploy_conda_package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy_conda_package.yml b/.github/workflows/deploy_conda_package.yml
index 4aa453fb3..67603c4d4 100644
--- a/.github/workflows/deploy_conda_package.yml
+++ b/.github/workflows/deploy_conda_package.yml
@@ -82,4 +82,4 @@ jobs:
           conda config --set anaconda_upload no;
           cd ${TACS_DIR}/conda;
           conda build --variants "{scalar: ${{ matrix.SCALAR }}}" -c conda-forge -c smdogroup $BUILD_ARGS --output-folder . .;
-          anaconda upload --label LABEL ${{ matrix.TARGET }}/*.tar.bz2 --force;
+          anaconda upload --label $LABEL ${{ matrix.TARGET }}/*.tar.bz2 --force;