From d3f37a7bc619771ec3b05b8bce29703c035752d4 Mon Sep 17 00:00:00 2001
From: "Lars T. Kyllingstad" <lars.kyllingstad@sintef.no>
Date: Tue, 17 Aug 2021 13:39:35 +0200
Subject: [PATCH 1/3] Clean up Conan CI build environment using Docker

---
 .github/workflows/ci-conan.yml | 61 ++++++++++++++++++----------------
 conanfile.py                   | 13 ++++++--
 2 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml
index 35ebbe7d..351b8a9e 100644
--- a/.github/workflows/ci-conan.yml
+++ b/.github/workflows/ci-conan.yml
@@ -3,24 +3,13 @@ name: libcosim CI Conan
 # This workflow is triggered on pushes to the repository.
 on: [push, workflow_dispatch]
 
-env:
-  CONAN_LOGIN_USERNAME_OSP: ${{ secrets.osp_artifactory_usr }}
-  CONAN_PASSWORD_OSP: ${{ secrets.osp_artifactory_pwd }}
-  CONAN_REVISIONS_ENABLED: 1
-  CONAN_NON_INTERACTIVE: True
-  CONAN_USE_ALWAYS_SHORT_PATHS: True
-
 jobs:
   conan-on-linux:
     name: Conan
-    runs-on: ${{ matrix.os }}
-    env:
-      CC: gcc-${{ matrix.compiler_version }}
-      CXX: g++-${{ matrix.compiler_version }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04]
         build_type: [Debug, Release]
         compiler_version: [7, 8, 9]
         compiler_libcxx: [libstdc++11]
@@ -28,16 +17,27 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Install prerequisites
+      - name: Generate Dockerfile
         run: |
-          sudo apt-get install -y --no-install-recommends \
-            g++-8
-          sudo pip3 install --upgrade setuptools pip
-          sudo pip3 install conan
-      - name: Configure Conan
-        run: conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
-      - name: Conan create
+          mkdir /tmp/osp-builder-docker
+          cat <<'EOF' >/tmp/osp-builder-docker/Dockerfile
+          FROM conanio/gcc${{ matrix.compiler_version }}
+          ENV CONAN_LOGIN_USERNAME_OSP=${{ secrets.osp_artifactory_usr }}
+          ENV CONAN_PASSWORD_OSP=${{ secrets.osp_artifactory_pwd }}
+          ENV CONAN_REVISIONS_ENABLED=1
+          ENV CONAN_NON_INTERACTIVE=True
+          ENV CONAN_USE_ALWAYS_SHORT_PATHS=True
+          ENV LIBCOSIM_RUN_TESTS_ON_CONAN_BUILD=True
+          COPY entrypoint.sh /
+          ENTRYPOINT /entrypoint.sh
+          EOF
+      - name: Generate entrypoint.sh
         run: |
+          cat <<'EOF' >/tmp/osp-builder-docker/entrypoint.sh
+          #!/bin/bash -v
+          set -eu
+          cd /mnt/source
+          conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
           REFNAME="${GITHUB_REF#refs/*/}"
           VERSION="v$(<version.txt)"
           if [[ $GITHUB_REF == refs/tags/* ]] && [[ $REFNAME == $VERSION ]]; then CHANNEL="stable"
@@ -47,16 +47,26 @@ jobs:
             CHANNEL="testing-${SHORT_REFNAME//\//_}"
           fi
           conan create -s build_type=${{ matrix.build_type }} -s compiler.version=${{ matrix.compiler_version }} -s compiler.libcxx=${{ matrix.compiler_libcxx }} -o ${{ matrix.option_fmuproxy }} -b missing . osp/${CHANNEL}
-      - name: Conan upload
-        run: |
           conan upload --all -c -r osp '*'
+          EOF
+          chmod 0755 /tmp/osp-builder-docker/entrypoint.sh
+      - name: Build Docker image
+        run: |
+          docker build -t osp-builder /tmp/osp-builder-docker/
+      - name: Build cosim
+        run: |
+          docker run --rm --env GITHUB_REF="$GITHUB_REF" -v $(pwd):/mnt/source:ro osp-builder
 
   conan-on-windows:
     name: Conan
     runs-on: ${{ matrix.os }}
     env:
+      CONAN_LOGIN_USERNAME_OSP: ${{ secrets.osp_artifactory_usr }}
+      CONAN_PASSWORD_OSP: ${{ secrets.osp_artifactory_pwd }}
+      CONAN_REVISIONS_ENABLED: 1
+      CONAN_NON_INTERACTIVE: True
+      CONAN_USE_ALWAYS_SHORT_PATHS: True
       CONAN_USER_HOME_SHORT: C:\c
-      CONAN_USE_ALWAYS_SHORT_PATHS: 1
     strategy:
       fail-fast: false
       matrix:
@@ -65,11 +75,6 @@ jobs:
         compiler_version: [15]
         option_fmuproxy: ['fmuproxy=True', 'fmuproxy=False']
 
-        exclude:
-          - os: windows-2016
-            build_type: Debug
-            option_fmuproxy: 'fmuproxy=True'
-
     steps:
       - uses: actions/checkout@v2
       - name: Install prerequisites
diff --git a/conanfile.py b/conanfile.py
index 11158805..d673a964 100755
--- a/conanfile.py
+++ b/conanfile.py
@@ -1,6 +1,6 @@
 import os
 
-from conans import ConanFile, CMake, tools
+from conans import ConanFile, CMake, RunEnvironment, tools
 from os import path
 
 
@@ -37,6 +37,9 @@ class LibcosimConan(ConanFile):
         "xerces-c:shared=True"
     )
 
+    def is_tests_enabled(self):
+        return os.getenv("LIBCOSIM_RUN_TESTS_ON_CONAN_BUILD", "False").lower() in ("true", "1")
+
     def set_version(self):
         self.version = tools.load(path.join(self.recipe_folder, "version.txt")).strip()
 
@@ -53,15 +56,21 @@ def configure_cmake(self):
         cmake = CMake(self)
         cmake.definitions["LIBCOSIM_USING_CONAN"] = "ON"
         cmake.definitions["LIBCOSIM_BUILD_APIDOC"] = "OFF"
-        cmake.definitions["LIBCOSIM_BUILD_TESTS"] = "OFF"
+        cmake.definitions["LIBCOSIM_BUILD_TESTS"] = self.is_tests_enabled()
         if self.options.fmuproxy:
             cmake.definitions["LIBCOSIM_WITH_FMUPROXY"] = "ON"
+            cmake.definitions["LIBCOSIM_TEST_FMUPROXY"] = "OFF" # Temporary, to be removed again in PR #633
         cmake.configure()
         return cmake
 
     def build(self):
         cmake = self.configure_cmake()
         cmake.build()
+        if self.is_tests_enabled():
+            env_run = RunEnvironment(self)
+            with tools.environment_append(env_run.vars):
+                cmake.test(output_on_failure=True)
+
 
     def package(self):
         cmake = self.configure_cmake()

From 0f8512576ad835a6156f7aee0d13f9c19fc281a5 Mon Sep 17 00:00:00 2001
From: "Lars T. Kyllingstad" <lars.kyllingstad@sintef.no>
Date: Wed, 18 Aug 2021 08:19:08 +0200
Subject: [PATCH 2/3] Run tests in Conan CI builds on Windows too

---
 .github/workflows/ci-conan.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml
index 351b8a9e..84d058b1 100644
--- a/.github/workflows/ci-conan.yml
+++ b/.github/workflows/ci-conan.yml
@@ -67,6 +67,7 @@ jobs:
       CONAN_NON_INTERACTIVE: True
       CONAN_USE_ALWAYS_SHORT_PATHS: True
       CONAN_USER_HOME_SHORT: C:\c
+      LIBCOSIM_RUN_TESTS_ON_CONAN_BUILD: True
     strategy:
       fail-fast: false
       matrix:

From 1346dcc8fcb753a6ab7b0e64d2472a9487075b6c Mon Sep 17 00:00:00 2001
From: "Lars T. Kyllingstad" <lars.kyllingstad@sintef.no>
Date: Wed, 18 Aug 2021 08:40:58 +0200
Subject: [PATCH 3/3] Avoid "True" being intercepted as YAML bool

---
 .github/workflows/ci-conan.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml
index 84d058b1..fdbc3a31 100644
--- a/.github/workflows/ci-conan.yml
+++ b/.github/workflows/ci-conan.yml
@@ -64,10 +64,10 @@ jobs:
       CONAN_LOGIN_USERNAME_OSP: ${{ secrets.osp_artifactory_usr }}
       CONAN_PASSWORD_OSP: ${{ secrets.osp_artifactory_pwd }}
       CONAN_REVISIONS_ENABLED: 1
-      CONAN_NON_INTERACTIVE: True
-      CONAN_USE_ALWAYS_SHORT_PATHS: True
+      CONAN_NON_INTERACTIVE: 1
+      CONAN_USE_ALWAYS_SHORT_PATHS: 1
       CONAN_USER_HOME_SHORT: C:\c
-      LIBCOSIM_RUN_TESTS_ON_CONAN_BUILD: True
+      LIBCOSIM_RUN_TESTS_ON_CONAN_BUILD: 1
     strategy:
       fail-fast: false
       matrix: