From 5d7fa0bbf2e223a36fb5fb1f99375081e9131182 Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul.wilson@wisc.edu>
Date: Thu, 1 Dec 2022 07:41:23 -0500
Subject: [PATCH 01/20] Add cubit 2022.11 to build

First attempt to add 2022.11 to linux
---
 .github/workflows/unix_linux.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/unix_linux.yml b/.github/workflows/unix_linux.yml
index 74f96d0a..53c035cb 100644
--- a/.github/workflows/unix_linux.yml
+++ b/.github/workflows/unix_linux.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        cubit: [2021.4, 2021.5, 2021.11, 2022.4]
+        cubit: [2021.4, 2021.5, 2021.11, 2022.4, 2022.11]
         os: [ubuntu]
         os_version: [20.04, 22.04]
         include:
@@ -97,6 +97,10 @@ jobs:
             BASE=Coreform-Cubit-2022.4%2B26186_e1209cf7
             CUBIT_BASE_NAME=Coreform-Cubit-2022.4
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
+          elif [ "${{ matrix.cubit }}" == "2022.11" ]; then
+            BASE=Coreform-Cubit-2022.11%2B32507
+            CUBIT_BASE_NAME=Coreform-Cubit-2022.11
+            HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           fi
 
           SUFFIX=Lin64

From ef19478d05c94dc7804570ca71488729a61a3d1e Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul.wilson@wisc.edu>
Date: Thu, 1 Dec 2022 07:55:49 -0500
Subject: [PATCH 02/20] Move suffix to if block

The suffix is now dependent on the version :(
---
 .github/workflows/unix_linux.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/unix_linux.yml b/.github/workflows/unix_linux.yml
index 53c035cb..050a4608 100644
--- a/.github/workflows/unix_linux.yml
+++ b/.github/workflows/unix_linux.yml
@@ -78,32 +78,37 @@ jobs:
 
           if [ "${{ matrix.cubit }}" == "17.1.0" ]; then
             BASE=Trelis-17.1.0
+            SUFFIX=Lin64
             BASESDK=Trelis-SDK-17.1.0
             CUBIT_BASE_NAME=Trelis-17.1
             HDF5_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial
           elif [ "${{ matrix.cubit }}" == "2021.4" ]; then
             BASE=Coreform-Cubit-2021.4%2B15017_05893177
+            SUFFIX=Lin64
             CUBIT_BASE_NAME=Coreform-Cubit-2021.4
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           elif [ "${{ matrix.cubit }}" == "2021.5" ]; then
             BASE=Coreform-Cubit-2021.5%2B15962_5043ef39
+            SUFFIX=Lin64
             CUBIT_BASE_NAME=Coreform-Cubit-2021.5
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           elif [ "${{ matrix.cubit }}" == "2021.11" ]; then
             BASE=Coreform-Cubit-2021.11%2B21637_35609873
+            SUFFIX=Lin64
             CUBIT_BASE_NAME=Coreform-Cubit-2021.11
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           elif [ "${{ matrix.cubit }}" == "2022.4" ]; then
             BASE=Coreform-Cubit-2022.4%2B26186_e1209cf7
+            SUFFIX=Lin64
             CUBIT_BASE_NAME=Coreform-Cubit-2022.4
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           elif [ "${{ matrix.cubit }}" == "2022.11" ]; then
             BASE=Coreform-Cubit-2022.11%2B32507
+            SUFFIX=lin64
             CUBIT_BASE_NAME=Coreform-Cubit-2022.11
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           fi
 
-          SUFFIX=Lin64
           EXT=deb
           echo "SED=sed" >> $GITHUB_ENV
           echo "BUILD_SHARED_LIBS=ON" >> $GITHUB_ENV

From afa6c97ae3eed639976b51b472284852bd8c6aaa Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul.wilson@wisc.edu>
Date: Thu, 1 Dec 2022 08:06:50 -0500
Subject: [PATCH 03/20] Add case to build script

Add case to this script as well
---
 scripts/unix_share_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/unix_share_build.sh b/scripts/unix_share_build.sh
index 57ff23ff..155b6a4e 100644
--- a/scripts/unix_share_build.sh
+++ b/scripts/unix_share_build.sh
@@ -215,7 +215,7 @@ function linux_setup_cubit() {
     cd ${FOLDER_PKG}
     $SUDO apt-get install -y ./${CUBIT_PKG}
 
-    if [ "$1" == "2021.3" ] || [ "$1" == "2021.4" ] || [ "$1" == "2021.5" ] || [ "$1" == "2021.11" ] || [ "$1" == "2022.4" ] ; then
+    if [ "$1" == "2021.3" ] || [ "$1" == "2021.4" ] || [ "$1" == "2021.5" ] || [ "$1" == "2021.11" ] || [ "$1" == "2022.4" ] || [ "$1" == "2022.11" ] ; then
 	    return
     fi
 

From b4eb2f72dc442337ca64c89f18d45157c7941fe0 Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul.wilson@wisc.edu>
Date: Tue, 17 Jan 2023 15:15:12 -0600
Subject: [PATCH 04/20] Move to 2023.1-rc

Skip 2022.11 b/c no SDK.  Trying the RC for 2023.1
---
 .github/workflows/unix_linux.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/unix_linux.yml b/.github/workflows/unix_linux.yml
index 050a4608..d0e5e6fd 100644
--- a/.github/workflows/unix_linux.yml
+++ b/.github/workflows/unix_linux.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        cubit: [2021.4, 2021.5, 2021.11, 2022.4, 2022.11]
+        cubit: [2021.4, 2021.5, 2021.11, 2022.4, 2023.1rc]
         os: [ubuntu]
         os_version: [20.04, 22.04]
         include:
@@ -102,10 +102,9 @@ jobs:
             SUFFIX=Lin64
             CUBIT_BASE_NAME=Coreform-Cubit-2022.4
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
-          elif [ "${{ matrix.cubit }}" == "2022.11" ]; then
-            BASE=Coreform-Cubit-2022.11%2B32507
+          elif [ "${{ matrix.cubit }}" == "2023.1rc" ]; then
+            BASE=Coreform-Cubit-2023.1-rc%2B33516
             SUFFIX=lin64
-            CUBIT_BASE_NAME=Coreform-Cubit-2022.11
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           fi
 

From 032c1a74f96af2d697f71afc4549e0df9ab02e86 Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul.wilson@wisc.edu>
Date: Tue, 17 Jan 2023 15:22:03 -0600
Subject: [PATCH 05/20] RC comes from different file path

---
 .github/workflows/unix_linux.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/unix_linux.yml b/.github/workflows/unix_linux.yml
index d0e5e6fd..8b364262 100644
--- a/.github/workflows/unix_linux.yml
+++ b/.github/workflows/unix_linux.yml
@@ -103,6 +103,7 @@ jobs:
             CUBIT_BASE_NAME=Coreform-Cubit-2022.4
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           elif [ "${{ matrix.cubit }}" == "2023.1rc" ]; then
+            COREFORM_BASE_URL=https://f002.backblazeb2.com/file/cubit-downloads/Coreform-Cubit/master
             BASE=Coreform-Cubit-2023.1-rc%2B33516
             SUFFIX=lin64
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0

From 8a82c974294ce7d616f88f7d34b2b6d51dab19dd Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul.wilson@wisc.edu>
Date: Tue, 17 Jan 2023 15:55:09 -0600
Subject: [PATCH 06/20] update reference to 2023.1rc in scripts

---
 scripts/unix_share_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/unix_share_build.sh b/scripts/unix_share_build.sh
index 155b6a4e..250d6ece 100644
--- a/scripts/unix_share_build.sh
+++ b/scripts/unix_share_build.sh
@@ -215,7 +215,7 @@ function linux_setup_cubit() {
     cd ${FOLDER_PKG}
     $SUDO apt-get install -y ./${CUBIT_PKG}
 
-    if [ "$1" == "2021.3" ] || [ "$1" == "2021.4" ] || [ "$1" == "2021.5" ] || [ "$1" == "2021.11" ] || [ "$1" == "2022.4" ] || [ "$1" == "2022.11" ] ; then
+    if [ "$1" == "2021.3" ] || [ "$1" == "2021.4" ] || [ "$1" == "2021.5" ] || [ "$1" == "2021.11" ] || [ "$1" == "2022.4" ] || [ "$1" == "2023.1rc" ] ; then
 	    return
     fi
 

From 68b923ee731d2a80e9f07c46293fb6b999f1ca49 Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul.wilson@wisc.edu>
Date: Thu, 19 Jan 2023 08:25:37 -0600
Subject: [PATCH 07/20] add missing variable in conditional

---
 .github/workflows/unix_linux.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/unix_linux.yml b/.github/workflows/unix_linux.yml
index 8b364262..96f13bd8 100644
--- a/.github/workflows/unix_linux.yml
+++ b/.github/workflows/unix_linux.yml
@@ -106,6 +106,7 @@ jobs:
             COREFORM_BASE_URL=https://f002.backblazeb2.com/file/cubit-downloads/Coreform-Cubit/master
             BASE=Coreform-Cubit-2023.1-rc%2B33516
             SUFFIX=lin64
+            CUBIT_BASE_NAME=Coreform-Cubit-2023.1rc
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           fi
 

From 0c2babe983884d8c13b78952a54b0dc675c67832 Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul.wilson@wisc.edu>
Date: Thu, 19 Jan 2023 08:28:09 -0600
Subject: [PATCH 08/20] add 2023.1rc to local build support

---
 scripts/unix_share_build.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/unix_share_build.sh b/scripts/unix_share_build.sh
index 44b4e5b9..5f5474d2 100644
--- a/scripts/unix_share_build.sh
+++ b/scripts/unix_share_build.sh
@@ -76,6 +76,8 @@ function setup_var() {
         CUBIT_PATH="/opt/Coreform-Cubit-2021.4"
     elif [ "$1" == "2022.4" ] ; then
         CUBIT_PATH="/opt/Coreform-Cubit-2022.4"
+    elif [ "$1" == "2023.1rc" ] ; then
+        CUBIT_PATH="/opt/Coreform-Cubit-2023.1rc"
     else
         echo "unknown Cubit version"
         return 1

From 8f31b840aba6b5bbcabf4cac28d85527c3066da9 Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul.wilson@wisc.edu>
Date: Thu, 19 Jan 2023 08:52:29 -0600
Subject: [PATCH 09/20] correct dirname

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

diff --git a/.github/workflows/unix_linux.yml b/.github/workflows/unix_linux.yml
index 96f13bd8..57884708 100644
--- a/.github/workflows/unix_linux.yml
+++ b/.github/workflows/unix_linux.yml
@@ -106,7 +106,7 @@ jobs:
             COREFORM_BASE_URL=https://f002.backblazeb2.com/file/cubit-downloads/Coreform-Cubit/master
             BASE=Coreform-Cubit-2023.1-rc%2B33516
             SUFFIX=lin64
-            CUBIT_BASE_NAME=Coreform-Cubit-2023.1rc
+            CUBIT_BASE_NAME=Coreform-Cubit-2023.1
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           fi
 

From 457837aef11e1673d0256ad9d482d81352d64605 Mon Sep 17 00:00:00 2001
From: "Paul P.H. Wilson" <paul.wilson@wisc.edu>
Date: Tue, 2 May 2023 20:23:47 -0500
Subject: [PATCH 10/20] update to 2023.4

---
 .github/workflows/unix_linux.yml | 19 ++++++++-----------
 .github/workflows/unix_mac.yml   |  6 +++++-
 scripts/unix_share_build.sh      |  8 ++++----
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/unix_linux.yml b/.github/workflows/unix_linux.yml
index 57884708..6514ee46 100644
--- a/.github/workflows/unix_linux.yml
+++ b/.github/workflows/unix_linux.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        cubit: [2021.4, 2021.5, 2021.11, 2022.4, 2023.1rc]
+        cubit: [2021.4, 2021.5, 2021.11, 2022.4, 2023.4]
         os: [ubuntu]
         os_version: [20.04, 22.04]
         include:
@@ -52,6 +52,9 @@ jobs:
             os_version: '10.10'  # using a 'string' here as the 0 gets rounded away otherwise
             cubit: 2022.4
 
+          - os: debian
+            os_version: '10.10'  # using a 'string' here as the 0 gets rounded away otherwise
+            cubit: 2023.4
 
     name: 'Cubit ${{ matrix.cubit }} Build for ${{ matrix.os }} ${{ matrix.os_version }} of Svalinn Plugin'
 
@@ -75,38 +78,32 @@ jobs:
         shell: bash -l {0}
         run: |
           COREFORM_BASE_URL=https://f002.backblazeb2.com/file/cubit-downloads/Coreform-Cubit/Releases
+          SUFFIX=Lin64
 
           if [ "${{ matrix.cubit }}" == "17.1.0" ]; then
             BASE=Trelis-17.1.0
-            SUFFIX=Lin64
             BASESDK=Trelis-SDK-17.1.0
             CUBIT_BASE_NAME=Trelis-17.1
             HDF5_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial
           elif [ "${{ matrix.cubit }}" == "2021.4" ]; then
             BASE=Coreform-Cubit-2021.4%2B15017_05893177
-            SUFFIX=Lin64
             CUBIT_BASE_NAME=Coreform-Cubit-2021.4
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           elif [ "${{ matrix.cubit }}" == "2021.5" ]; then
             BASE=Coreform-Cubit-2021.5%2B15962_5043ef39
-            SUFFIX=Lin64
             CUBIT_BASE_NAME=Coreform-Cubit-2021.5
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           elif [ "${{ matrix.cubit }}" == "2021.11" ]; then
             BASE=Coreform-Cubit-2021.11%2B21637_35609873
-            SUFFIX=Lin64
             CUBIT_BASE_NAME=Coreform-Cubit-2021.11
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           elif [ "${{ matrix.cubit }}" == "2022.4" ]; then
             BASE=Coreform-Cubit-2022.4%2B26186_e1209cf7
-            SUFFIX=Lin64
             CUBIT_BASE_NAME=Coreform-Cubit-2022.4
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
-          elif [ "${{ matrix.cubit }}" == "2023.1rc" ]; then
-            COREFORM_BASE_URL=https://f002.backblazeb2.com/file/cubit-downloads/Coreform-Cubit/master
-            BASE=Coreform-Cubit-2023.1-rc%2B33516
-            SUFFIX=lin64
-            CUBIT_BASE_NAME=Coreform-Cubit-2023.1
+          elif [ "${{ matrix.cubit }}" == "2023.4" ]; then
+            BASE=Coreform-Cubit-2023.4%2B36047
+            CUBIT_BASE_NAME=Coreform-Cubit-2023.4
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           fi
 
diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 1e604535..4f47f228 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -34,7 +34,7 @@ jobs:
     runs-on: macos-11
     strategy:
       matrix:
-        cubit: [17.1.0, 2021.4, 2021.5, 2021.11, 2022.4]
+        cubit: [17.1.0, 2021.4, 2021.5, 2021.11, 2022.4, 2023.4]
 
     name: 'Cubit ${{ matrix.cubit }} Build for MacOS of Svalinn Plugin'
 
@@ -67,6 +67,10 @@ jobs:
             BASE=Coreform-Cubit-2022.4%2B26186_e1209cf7
             CUBIT_BASE_NAME=Coreform-Cubit-2022.4
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
+          elif [ "${{ matrix.cubit }}" == "2023.4" ]; then
+            BASE=Coreform-Cubit-2023.4%2B36047
+            CUBIT_BASE_NAME=Coreform-Cubit-2023.4
+            HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           fi
 
           SUFFIX=Mac64
diff --git a/scripts/unix_share_build.sh b/scripts/unix_share_build.sh
index 5f5474d2..aec9e0dd 100644
--- a/scripts/unix_share_build.sh
+++ b/scripts/unix_share_build.sh
@@ -76,8 +76,8 @@ function setup_var() {
         CUBIT_PATH="/opt/Coreform-Cubit-2021.4"
     elif [ "$1" == "2022.4" ] ; then
         CUBIT_PATH="/opt/Coreform-Cubit-2022.4"
-    elif [ "$1" == "2023.1rc" ] ; then
-        CUBIT_PATH="/opt/Coreform-Cubit-2023.1rc"
+    elif [ "$1" == "2023.4" ] ; then
+        CUBIT_PATH="/opt/Coreform-Cubit-2023.4"
     else
         echo "unknown Cubit version"
         return 1
@@ -216,7 +216,7 @@ function linux_setup_cubit() {
     cd ${FOLDER_PKG}
     $SUDO apt-get install -y ./${CUBIT_PKG}
 
-    if [ "$1" == "2021.3" ] || [ "$1" == "2021.4" ] || [ "$1" == "2021.5" ] || [ "$1" == "2021.11" ] || [ "$1" == "2022.4" ] || [ "$1" == "2023.1rc" ] ; then
+    if [ "$1" == "2021.3" ] || [ "$1" == "2021.4" ] || [ "$1" == "2021.5" ] || [ "$1" == "2021.11" ] || [ "$1" == "2022.4" ] || [ "$1" == "2023.4" ] ; then
 	    return
     fi
 
@@ -289,7 +289,7 @@ function mac_build_plugin_pkg(){
     install_name_tool -change /usr/local/opt/libaec/lib/libsz.dylib @rpath/libsz.dylib libsvalinn_plugin.so
 
     libsz=libsz.dylib
-    if [ "$1" == "2022.4" ] ; then
+    if [ "$1" == "2022.4" ] || [ "$1" == "2023.4" ] ; then
         libsz=libsz.2.dylib
     fi
 

From db9b3ff7946b7309876f0de36a0fe804eff71a63 Mon Sep 17 00:00:00 2001
From: "Paul P.H. Wilson" <paul.wilson@wisc.edu>
Date: Tue, 2 May 2023 20:45:28 -0500
Subject: [PATCH 11/20] back off on Debian for now

---
 .github/workflows/unix_linux.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/unix_linux.yml b/.github/workflows/unix_linux.yml
index 6514ee46..3d7f6af4 100644
--- a/.github/workflows/unix_linux.yml
+++ b/.github/workflows/unix_linux.yml
@@ -52,10 +52,6 @@ jobs:
             os_version: '10.10'  # using a 'string' here as the 0 gets rounded away otherwise
             cubit: 2022.4
 
-          - os: debian
-            os_version: '10.10'  # using a 'string' here as the 0 gets rounded away otherwise
-            cubit: 2023.4
-
     name: 'Cubit ${{ matrix.cubit }} Build for ${{ matrix.os }} ${{ matrix.os_version }} of Svalinn Plugin'
 
     container:

From 1ee3aa9def573058a80c2ba680af7da394f7cb42 Mon Sep 17 00:00:00 2001
From: "Paul P.H. Wilson" <paul.wilson@wisc.edu>
Date: Wed, 3 May 2023 08:24:20 -0500
Subject: [PATCH 12/20] 2023.4 workaround for testing

---
 scripts/unix_share_build.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/unix_share_build.sh b/scripts/unix_share_build.sh
index aec9e0dd..9ef61e1a 100644
--- a/scripts/unix_share_build.sh
+++ b/scripts/unix_share_build.sh
@@ -216,6 +216,14 @@ function linux_setup_cubit() {
     cd ${FOLDER_PKG}
     $SUDO apt-get install -y ./${CUBIT_PKG}
 
+    if [ "$1" == "2023.4" ]; then
+        cd ${CUBIT_PATH}
+        mkdir license_server
+        cd license_server
+        ln -sf ../bin/libcf_license_server.so .
+        ln -sf ../bin/libcf_license_renewals.so .
+    fi
+
     if [ "$1" == "2021.3" ] || [ "$1" == "2021.4" ] || [ "$1" == "2021.5" ] || [ "$1" == "2021.11" ] || [ "$1" == "2022.4" ] || [ "$1" == "2023.4" ] ; then
 	    return
     fi

From ff6eca43d994c074e6ecebe9f5ea2d8a33eab28b Mon Sep 17 00:00:00 2001
From: "Paul P.H. Wilson" <paul.wilson@wisc.edu>
Date: Wed, 3 May 2023 08:58:49 -0500
Subject: [PATCH 13/20] different MacOS package extension

---
 .github/workflows/unix_mac.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 4f47f228..1fb00df2 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -45,6 +45,7 @@ jobs:
         shell: bash -l {0}
         run: |
           COREFORM_BASE_URL=https://f002.backblazeb2.com/file/cubit-downloads/Coreform-Cubit/Releases
+          EXT=dmg
 
           if [ "${{ matrix.cubit }}" == "17.1.0" ]; then
             BASE=Trelis-17.1.0
@@ -71,10 +72,10 @@ jobs:
             BASE=Coreform-Cubit-2023.4%2B36047
             CUBIT_BASE_NAME=Coreform-Cubit-2023.4
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
+            EXT=pkg
           fi
 
           SUFFIX=Mac64
-          EXT=dmg
           echo "SED=gsed" >> $GITHUB_ENV
           echo "BUILD_SHARED_LIBS=OFF" >> $GITHUB_ENV
           echo "BUILD_STATIC_LIBS=ON" >> $GITHUB_ENV

From 467f1be905f5c56004ff50727de4ee0acf9cf485 Mon Sep 17 00:00:00 2001
From: "Paul P.H. Wilson" <paul.wilson@wisc.edu>
Date: Wed, 3 May 2023 10:32:57 -0500
Subject: [PATCH 14/20] support two types of Mac package

---
 scripts/unix_share_build.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/scripts/unix_share_build.sh b/scripts/unix_share_build.sh
index 9ef61e1a..f3f6d30c 100644
--- a/scripts/unix_share_build.sh
+++ b/scripts/unix_share_build.sh
@@ -177,7 +177,19 @@ function remove_app_logger() {
     $SUDO $SED -i "s/\/\.\.\/app_logger\;//" CubitUtilConfig.cmake
 }
 
-function mac_setup_cubit() {
+function mac_setup_cubit () {
+    if [ "${CUBIT_PKG##*.}" == "pkg" ]; then
+        mac_pkg_setup_cubit $1
+    else
+        mac_dmg_setup_cubit $1
+    fi
+}
+function mac_pkg_setup_cubit() {
+    cd ${FOLDER_PKG}
+    sudo installer -pkg /path/to/package.pkg -target /
+}
+
+function mac_dmg_setup_cubit() {
     cd ${FOLDER_PKG}
     hdiutil convert ${CUBIT_PKG} -format UDTO -o cubit_eula.dmg.cdr
     hdiutil attach cubit_eula.dmg.cdr -mountpoint /Volumes/Cubit

From 021cb905d72a4ab3073da0402b7e09c43aaa8942 Mon Sep 17 00:00:00 2001
From: "Paul P.H. Wilson" <paul.wilson@wisc.edu>
Date: Wed, 3 May 2023 12:15:36 -0500
Subject: [PATCH 15/20] fix stupid cut/paste error

---
 scripts/unix_share_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/unix_share_build.sh b/scripts/unix_share_build.sh
index f3f6d30c..e8505903 100644
--- a/scripts/unix_share_build.sh
+++ b/scripts/unix_share_build.sh
@@ -186,7 +186,7 @@ function mac_setup_cubit () {
 }
 function mac_pkg_setup_cubit() {
     cd ${FOLDER_PKG}
-    sudo installer -pkg /path/to/package.pkg -target /
+    sudo installer -pkg ${CUBIT_PKG} -target /
 }
 
 function mac_dmg_setup_cubit() {

From 273b2df5f239ec421196551af6f73106b08ead51 Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul.wilson@wisc.edu>
Date: Mon, 19 Jun 2023 20:07:04 -0500
Subject: [PATCH 16/20] Only try to build the new dev version

---
 .github/workflows/unix_linux.yml | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/unix_linux.yml b/.github/workflows/unix_linux.yml
index 3d7f6af4..ca52b0c7 100644
--- a/.github/workflows/unix_linux.yml
+++ b/.github/workflows/unix_linux.yml
@@ -32,25 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        cubit: [2021.4, 2021.5, 2021.11, 2022.4, 2023.4]
+        cubit: [2023.6-dev]
         os: [ubuntu]
-        os_version: [20.04, 22.04]
-        include:
-          - os: ubuntu
-            os_version: 18.04
-            cubit: 17.1.0
-
-          - os: debian
-            os_version: '10.10'  # using a 'string' here as the 0 gets rounded away otherwise
-            cubit: 2021.5
-
-          - os: debian
-            os_version: '10.10'  # using a 'string' here as the 0 gets rounded away otherwise
-            cubit: 2021.11
-
-          - os: debian
-            os_version: '10.10'  # using a 'string' here as the 0 gets rounded away otherwise
-            cubit: 2022.4
+        os_version: [22.04]
 
     name: 'Cubit ${{ matrix.cubit }} Build for ${{ matrix.os }} ${{ matrix.os_version }} of Svalinn Plugin'
 
@@ -97,9 +81,10 @@ jobs:
             BASE=Coreform-Cubit-2022.4%2B26186_e1209cf7
             CUBIT_BASE_NAME=Coreform-Cubit-2022.4
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
-          elif [ "${{ matrix.cubit }}" == "2023.4" ]; then
-            BASE=Coreform-Cubit-2023.4%2B36047
-            CUBIT_BASE_NAME=Coreform-Cubit-2023.4
+          elif [ "${{ matrix.cubit }}" == "2023.6-dev" ]; then
+            COREFORM_BASE_URL=https://f002.backblazeb2.com/file/cubit-downloads/Coreform-Cubit/master
+            BASE=Coreform-Cubit-2023.6-rc%2B38128
+            CUBIT_BASE_NAME=Coreform-Cubit-2023.6-dev
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           fi
 

From 5de450e5567b669efb35e6d46ac651e7958478cb Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul.wilson@wisc.edu>
Date: Mon, 19 Jun 2023 20:08:52 -0500
Subject: [PATCH 17/20] Add 2023.6-dev

---
 scripts/unix_share_build.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/unix_share_build.sh b/scripts/unix_share_build.sh
index e8505903..58cfa2c3 100644
--- a/scripts/unix_share_build.sh
+++ b/scripts/unix_share_build.sh
@@ -76,8 +76,8 @@ function setup_var() {
         CUBIT_PATH="/opt/Coreform-Cubit-2021.4"
     elif [ "$1" == "2022.4" ] ; then
         CUBIT_PATH="/opt/Coreform-Cubit-2022.4"
-    elif [ "$1" == "2023.4" ] ; then
-        CUBIT_PATH="/opt/Coreform-Cubit-2023.4"
+    elif [ "$1" == "2023.6-dev" ] ; then
+        CUBIT_PATH="/opt/Coreform-Cubit-2023.6-dev"
     else
         echo "unknown Cubit version"
         return 1
@@ -236,7 +236,7 @@ function linux_setup_cubit() {
         ln -sf ../bin/libcf_license_renewals.so .
     fi
 
-    if [ "$1" == "2021.3" ] || [ "$1" == "2021.4" ] || [ "$1" == "2021.5" ] || [ "$1" == "2021.11" ] || [ "$1" == "2022.4" ] || [ "$1" == "2023.4" ] ; then
+    if [ "$1" == "2021.3" ] || [ "$1" == "2021.4" ] || [ "$1" == "2021.5" ] || [ "$1" == "2021.11" ] || [ "$1" == "2022.4" ] || [ "$1" == "2023.6-dev" ] ; then
 	    return
     fi
 
@@ -309,7 +309,7 @@ function mac_build_plugin_pkg(){
     install_name_tool -change /usr/local/opt/libaec/lib/libsz.dylib @rpath/libsz.dylib libsvalinn_plugin.so
 
     libsz=libsz.dylib
-    if [ "$1" == "2022.4" ] || [ "$1" == "2023.4" ] ; then
+    if [ "$1" == "2022.4" ] || [ "$1" == "2023.6-dev" ] ; then
         libsz=libsz.2.dylib
     fi
 

From b098b292689d13b4c7f2783f3ef4b3190a56b3ce Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul.wilson@wisc.edu>
Date: Mon, 19 Jun 2023 20:31:41 -0500
Subject: [PATCH 18/20] fix path in shell script

---
 scripts/unix_share_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/unix_share_build.sh b/scripts/unix_share_build.sh
index 58cfa2c3..1daed2cb 100644
--- a/scripts/unix_share_build.sh
+++ b/scripts/unix_share_build.sh
@@ -77,7 +77,7 @@ function setup_var() {
     elif [ "$1" == "2022.4" ] ; then
         CUBIT_PATH="/opt/Coreform-Cubit-2022.4"
     elif [ "$1" == "2023.6-dev" ] ; then
-        CUBIT_PATH="/opt/Coreform-Cubit-2023.6-dev"
+        CUBIT_PATH="/opt/Coreform-Cubit-2023.6"
     else
         echo "unknown Cubit version"
         return 1

From ce669c20d2181fc2b0980c2e048ee773eafdfc02 Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul.wilson@wisc.edu>
Date: Mon, 19 Jun 2023 20:32:35 -0500
Subject: [PATCH 19/20] change path in workflow yml

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

diff --git a/.github/workflows/unix_linux.yml b/.github/workflows/unix_linux.yml
index ca52b0c7..71b3fd9e 100644
--- a/.github/workflows/unix_linux.yml
+++ b/.github/workflows/unix_linux.yml
@@ -84,7 +84,7 @@ jobs:
           elif [ "${{ matrix.cubit }}" == "2023.6-dev" ]; then
             COREFORM_BASE_URL=https://f002.backblazeb2.com/file/cubit-downloads/Coreform-Cubit/master
             BASE=Coreform-Cubit-2023.6-rc%2B38128
-            CUBIT_BASE_NAME=Coreform-Cubit-2023.6-dev
+            CUBIT_BASE_NAME=Coreform-Cubit-2023.6
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           fi
 

From a6b6a40c1d83404efd4c4d934f9b154a7db54b7c Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul.wilson@wisc.edu>
Date: Thu, 22 Jun 2023 10:12:23 -0500
Subject: [PATCH 20/20] Add addition CMake variable

This sets another CMake variable to find Cubit.  It's additional for now, and we'll try to remove others if it works.
---
 scripts/unix_share_build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/unix_share_build.sh b/scripts/unix_share_build.sh
index 1daed2cb..3628bb61 100644
--- a/scripts/unix_share_build.sh
+++ b/scripts/unix_share_build.sh
@@ -258,6 +258,7 @@ function build_plugin(){
     cd bld
     cmake ../Cubit-plugin -DCMAKE_PREFIX_PATH=${CUBIT_PATH} \
                            -DCUBIT_ROOT=${CUBIT_PATH} \
+                           -DCubit_DIR=${CUBIT_PATH} \
                            -DDAGMC_DIR=${PLUGIN_ABS_PATH}/DAGMC \
                            -DCMAKE_BUILD_TYPE=Release \
                             $CMAKE_ADDITIONAL_FLAGS \