Revert "Fix CMake commands in GitHub Actions workflow"

This reverts commit dd6d31f.
open-simulation-platform · Feb 22, 2024 · b0d31bf · b0d31bf
1 parent 9920f61
commit b0d31bf
Showing 1 changed file with 11 additions and 19 deletions.
diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml
@@ -15,10 +15,6 @@ jobs:
         option_proxyfmu: ['proxyfmu=True', 'proxyfmu=False']
 
     steps:
-      - id: build_type_string
-        uses: ASzc/change-string-case-action@v6
-        with:
-          string: ${{ matrix.build_type }}
       - uses: actions/checkout@v4
       - name: Generate Dockerfile
         run: |
@@ -35,10 +31,10 @@ jobs:
           set -eu
           conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
           cd /mnt/source
-          conan install . -s build_type=${{ matrix.build_type }} -o "libcosim/*:${{ matrix.option_proxyfmu }}" --build=missing
-          cmake --preset=conan-${{ steps.build_type_string.outputs.lowercase }}
-          cmake --build --preset=conan-${{ steps.build_type_string.outputs.lowercase }}
-          cmake --build --preset=conan-${{ steps.build_type_string.outputs.lowercase }} --target install
+          conan install . --output-folder=build -s build_type=${{ matrix.build_type }} -o "libcosim/*:${{ matrix.option_proxyfmu }}" --build=missing
+          cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+          cmake --build build
+          cmake --build build --target install
           EOF
           chmod 0777 /tmp/osp-builder-docker/entrypoint.sh
       - name: Build Docker image
@@ -50,8 +46,8 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: cosim-${{ runner.os }}-${{ steps.build_type_string.outputs.lowercase }}-${{ matrix.compiler_version }}-${{ matrix.option_proxyfmu }}
-          path: build/${{ matrix.build_type }}/dist
+          name: cosim-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.compiler_version }}-${{ matrix.option_proxyfmu }}
+          path: build/dist
 
   windows:
     name: Windows
@@ -64,10 +60,6 @@ jobs:
         option_proxyfmu: ['proxyfmu=True', 'proxyfmu=False']
 
     steps:
-      - id: build_type_string
-        uses: ASzc/change-string-case-action@v6
-        with:
-          string: ${{ matrix.build_type }}
       - uses: actions/checkout@v4
       - name: Install prerequisites
         run: |
@@ -79,12 +71,12 @@ jobs:
           conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
       - name: Build
         run: |
-          conan install . -s build_type=${{ matrix.build_type }} -o "libcosim/*:${{ matrix.option_proxyfmu }}" --build=missing
-          cmake --preset=conan-default
-          cmake --build --preset=conan-${{ steps.build_type_string.outputs.lowercase }}
-          cmake --build --preset=conan-${{ steps.build_type_string.outputs.lowercase }} --target install
+          conan install . --output-folder=build -s build_type=${{ matrix.build_type }} -o "libcosim/*:${{ matrix.option_proxyfmu }}" --build=missing
+          cmake -A x64 -B build -S . "-DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake"
+          cmake --build build --config ${{ matrix.build_type }}
+          cmake --build build --config ${{ matrix.build_type }} --target install
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
           name: cosim-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.option_proxyfmu }}
-          path: build/${{ matrix.build_type }}/dist
+          path: build/dist