Merge pull request #10 from cascade-gmbh/develop

Develop
cascade-gmbh · Jan 18, 2023 · 4f8cd68 · 4f8cd68
2 parents 8b80d63 + 13e0052
commit 4f8cd68
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/.github/workflows/build-and-deploy-executables.yml b/.github/workflows/build-and-deploy-executables.yml
@@ -12,18 +12,27 @@ jobs:
 
     env:
       CMAKE_BUILD_TYPE: "${{ matrix.build_type }}"
-      TARGET_SPEC: ${{ matrix.os }}-${{ matrix.build_type }}
 
     defaults:
       run:
         shell: bash
 
     steps:   
+
       - uses: actions/checkout@v3
+
       - run: ./build.sh 
+
+      - run: |      
+          if test -f "cocor.exe"; then
+            mv cocor.exe ./cocor.${{ matrix.os }}-${{ matrix.build_type }}.exe
+          else  
+            mv cocor ./cocor.${{ matrix.os }}-${{ matrix.build_type }}
+          fi          
+          
       - uses: actions/upload-artifact@v3
         with:
-          name: cocor-artifacts
+          name: cocor-executables
           path: cocor.${{ matrix.os }}-${{ matrix.build_type }}*
           if-no-files-found: error 
 
@@ -40,7 +49,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v3
         with:
-          name: cocor-artifacts   
+          name: cocor-executables  
       - uses: ncipollo/release-action@v1
         with:
           tag: "v1.0.0"

diff --git a/README.md b/README.md
@@ -4,7 +4,8 @@
 [![](https://github.com/cascade-gmbh/cocor/actions/workflows/build-and-deploy-executables.yml/badge.svg)](.github/workflows/build-and-deploy-executables.yml)
 
 Fork from [CocoR-CPP](https://github.com/mingodad/CocoR-CPP).  
-Executables used by [Cascade Public Monorepo](https://github.com/cascade-gmbh/cascade-public-monorepo).
+Executables used by [Cascade Public Monorepo](https://github.com/cascade-gmbh/cascade-public-monorepo).  
+Compiler: clang on macOS, gcc on Ubuntu, msvc on Windows.
 
 ## Deployed executables
 

diff --git a/build.sh b/build.sh
@@ -3,26 +3,24 @@
 # set current directory to script source directory:
 cd $(dirname $0)
 
+# ensure environment:
+if [[ -z "${CMAKE_BUILD_TYPE}" ]]; then
+  CMAKE_BUILD_TYPE="Debug"
+fi
+
 echo ------------------------------------------------------- build-cocor
 
-# invoke cmake
-echo CMAKE:
 cmake .  
 cmake --build . --config $CMAKE_BUILD_TYPE
 
-# copy build result
-echo EXECUTABLE:
-if test -f "cocor"; then
-  cp ./cocor ./cocor.$TARGET_SPEC
-elif test -f "Debug/cocor.exe"; then
-  cp ./Debug/cocor.exe ./cocor.$TARGET_SPEC.exe
+if test -f "Debug/cocor.exe"; then
+  cp ./Debug/cocor.exe ./cocor.exe
+
 elif test -f "Release/cocor.exe"; then
-  cp ./Release/cocor.exe ./cocor.$TARGET_SPEC.exe
+  cp ./Release/cocor.exe ./cocor.exe
+
 fi
-ls cocor.$TARGET_SPEC*
 
-# simple test
 echo COCOR TEST-CALL WITHOUT PARAMETERS:
-./cocor.$TARGET_SPEC
-
+./cocor