Merge pull request #121 from bam241/mac_version

svalinn · Aug 23, 2021 · 049a678 · 049a678
2 parents bc13faf + 60e7ef3
commit 049a678
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
@@ -19,14 +19,12 @@ env:
 
 jobs:
   main:
-    runs-on: ${{ matrix.os }}-${{ matrix.os_version }}
+    runs-on: macos-10.15
     strategy:
       matrix:
         cubit: [17.1.0, 2021.4, 2021.5]
-        os: [macos]
-        os_version: [10.15]
 
-    name: 'Cubit ${{ matrix.cubit }} Build for ${{ matrix.os }} ${{ matrix.os_version }} of Svalinn Plugin'
+    name: 'Cubit ${{ matrix.cubit }} Build for MacOS of Svalinn Plugin'
 
     steps:
       - uses: actions/checkout@v2
@@ -60,8 +58,7 @@ jobs:
           echo "CUBIT_PATH=/Applications/${CUBIT_BASE_NAME}.app/Contents" >> $GITHUB_ENV
           echo "COREFORM_BASE_URL=${COREFORM_BASE_URL}/MacOS/" >> $GITHUB_ENV
 
-          echo "OS=${{ matrix.os }}" >> $GITHUB_ENV
-          echo "OS_VERSION=${{ matrix.os_version }}" >> $GITHUB_ENV
+          echo "OS=macos" >> $GITHUB_ENV
           echo "CMAKE_ADDITIONAL_FLAGS=-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0" >> $GITHUB_ENV
 
           echo "CUBIT_PKG=${BASE}-${SUFFIX}.${EXT}" >> $GITHUB_ENV
@@ -126,15 +123,15 @@ jobs:
         name: Upload artifact for CI
         uses: actions/upload-artifact@v2
         with:
-          name: svalinn-plugin_${{ matrix.os }}-${{ matrix.os_version }}_cubit_${{ matrix.cubit }}.tgz
-          path: ${{ github.workspace }}/release/svalinn-plugin_${{ matrix.os }}-${{ matrix.os_version }}_cubit_${{ matrix.cubit }}.tgz
+          name: svalinn-plugin_${{env.OS}}_cubit_${{ matrix.cubit }}.tgz
+          path: ${{ github.workspace }}/release/svalinn-plugin_${{env.OS}}_cubit_${{ matrix.cubit }}.tgz
           if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn` 
 
       - if: github.event_name == 'release'
         name: Upload binaries into the release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ github.workspace }}/release/svalinn-plugin_${{ matrix.os }}-${{ matrix.os_version }}_cubit_${{ matrix.cubit }}.tgz
-          asset_name: svalinn-plugin_${{ matrix.os }}-${{ matrix.os_version }}_cubit_${{ matrix.cubit }}.tgz
+          file: ${{ github.workspace }}/release/svalinn-plugin_${{env.OS}}_cubit_${{ matrix.cubit }}.tgz
+          asset_name: svalinn-plugin_${{env.OS}}_cubit_${{ matrix.cubit }}.tgz
           tag: ${{ github.ref }}
diff --git a/scripts/unix_share_build.sh b/scripts/unix_share_build.sh
@@ -302,7 +302,7 @@ function mac_build_plugin_pkg(){
     cd ..
     ln -sv svalinn/libsvalinn_plugin.so .
     cd ../..
-    PLUGIN_FILENAME=svalinn-plugin_${OS}-${OS_VERSION}_cubit_$1.tgz
+    PLUGIN_FILENAME=svalinn-plugin_${OS}_cubit_$1.tgz
     tar -czvf ${PLUGIN_FILENAME} MacOS
     chmod 666 ${PLUGIN_FILENAME}
     cp ${PLUGIN_FILENAME} $SCRIPTPATH/release/