fix(CD): missing CPack system name

Geode-solutions · Jan 30, 2020 · 7aa9327 · 7aa9327
1 parent 9aa11b3
commit 7aa9327
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
@@ -5,14 +5,14 @@ on:
     tags: 'v*'
 
 jobs:      
-  release-ubuntu:
+  release-linux:
     runs-on: ubuntu-18.04
     container: ${{ matrix.config.container }}
     strategy:
       matrix:
         config:
         - {container: "geodesolutions/ubuntu", system: "ubuntu", doc: true}
-        - {container: "geodesolutions/centos", system: "RHEL", doc: false}
+        - {container: "geodesolutions/centos", system: "rhel", doc: false}
 
     steps:
     - uses: actions/checkout@v1
@@ -59,14 +59,14 @@ jobs:
         cd build
         version="${GITHUB_REF##*/*/}"
         echo ::set-output name=version::$version
-        cmake -G "Xcode" -DCMAKE_BUILD_TYPE=Release -DOPENGEODE_WITH_PYTHON:BOOL=ON -DOPENGEODE_WITH_TESTS:BOOL=OFF -DCPACK_PACKAGE_VERSION:STRING=$version ..
+        cmake -G "Xcode" -DCMAKE_BUILD_TYPE=Release -DOPENGEODE_WITH_PYTHON:BOOL=ON -DOPENGEODE_WITH_TESTS:BOOL=OFF -DCPACK_PACKAGE_VERSION:STRING=$version -DCPACK_SYSTEM_NAME:STRING=darwin..
         cmake --build . --config Release
         cd opengeode
         cmake --build . --target package --config Release
     - name: Upload
       uses: softprops/action-gh-release@v1
       with:
-        files: "build/opengeode/OpenGeode-${{ steps.package.outputs.version }}-Darwin.tar.gz"
+        files: "build/opengeode/OpenGeode-${{ steps.package.outputs.version }}-darwin.tar.gz"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Notify slack
@@ -90,7 +90,7 @@ jobs:
         cd build
         version="${GITHUB_REF##*/*/}"
         echo ::set-output name=version::$version
-        cmake -G "Visual Studio 15 2017 Win64" -DOPENGEODE_WITH_PYTHON:BOOL=ON -DOPENGEODE_WITH_TESTS:BOOL=OFF -DCPACK_PACKAGE_VERSION:STRING=$version ..
+        cmake -G "Visual Studio 15 2017 Win64" -DOPENGEODE_WITH_PYTHON:BOOL=ON -DOPENGEODE_WITH_TESTS:BOOL=OFF -DCPACK_PACKAGE_VERSION:STRING=$version -DCPACK_SYSTEM_NAME:STRING=win64..
         cmake --build . --config Release
         cd opengeode
         cmake --build . --target PACKAGE --config Release

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -16,7 +16,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.TOKEN }}
 
-  build-ubuntu:
+  build-linux:
     runs-on: ubuntu-18.04
     container: ${{ matrix.config.container }}
     needs: format
@@ -142,7 +142,7 @@ jobs:
 
   semantic-release:
     runs-on: ubuntu-18.04
-    needs: [build-ubuntu, coverage, build-mac-xcode, build-windows]
+    needs: [build-linux, coverage, build-mac-xcode, build-windows]
     steps:
     - uses: actions/checkout@v1
     - run: npx semantic-release