From b0d31bfc90d7dc8f85358c94611fd5390b0aba77 Mon Sep 17 00:00:00 2001
From: "Lars T. Kyllingstad" <lars.kyllingstad@sintef.no>
Date: Thu, 22 Feb 2024 09:52:35 +0100
Subject: [PATCH] Revert "Fix CMake commands in GitHub Actions workflow"

This reverts commit dd6d31f77737302cd8b1b57450a5866ccc1abdd3.
---
 .github/workflows/ci-conan.yml | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml
index 3da9dbe..c909693 100644
--- 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