diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index e53c0e4..f4f3374 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -14,6 +14,7 @@ jobs: compiler_version: [9] compiler_libcxx: [libstdc++11] option_proxyfmu: ['proxyfmu=True', 'proxyfmu=False'] + option_shared: ['shared=True', 'shared=False'] steps: - uses: actions/checkout@v2 @@ -41,7 +42,7 @@ jobs: set -eu cd /mnt/source/build conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force - conan install -s build_type=${{ matrix.build_type }} -s compiler.version=${{ matrix.compiler_version }} -s compiler.libcxx=${{ matrix.compiler_libcxx }} -o libcosim:${{ matrix.option_proxyfmu }} -b missing .. + conan install -s build_type=${{ matrix.build_type }} -s compiler.version=${{ matrix.compiler_version }} -s compiler.libcxx=${{ matrix.compiler_libcxx }} -o libcosim:${{ matrix.option_proxyfmu }} -o libcosim:${{ matrix.option_shared }}-b missing .. for f in dist/lib/*; do patchelf --set-rpath \$ORIGIN $f; done cmake -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} .. cmake --build . @@ -57,7 +58,7 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v2 with: - name: cosim-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.compiler_version }}-${{ matrix.option_proxyfmu }} + name: cosim-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.compiler_version }}-${{ matrix.option_proxyfmu }}-${{ matrix.option_shared }} path: build/dist conan-on-windows: @@ -75,6 +76,7 @@ jobs: os: [windows-2019] build_type: [Debug, Release] option_proxyfmu: ['proxyfmu=True', 'proxyfmu=False'] + option_shared: ['shared=True', 'shared=False'] steps: - uses: actions/checkout@v2 @@ -89,12 +91,12 @@ jobs: run: | mkdir build cd build - conan install -s build_type=${{ matrix.build_type }} -o libcosim:${{ matrix.option_proxyfmu }} -b missing ../ + conan install -s build_type=${{ matrix.build_type }} -o libcosim:${{ matrix.option_proxyfmu }} -o libcosim:${{ matrix.option_shared }} -b missing ../ cmake -A x64 ../ cmake --build . --config ${{ matrix.build_type }} cmake --build . --config ${{ matrix.build_type }} --target install - name: Upload artifact uses: actions/upload-artifact@v2 with: - name: cosim-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.option_proxyfmu }} + name: cosim-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.option_proxyfmu }}-${{ matrix.option_shared }} path: build/dist