diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index e54bb0b..0687eee 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -11,30 +11,30 @@ jobs: fail-fast: false matrix: build_type: [Debug, Release] - compiler_version: [9] + compiler_version: [14] option_shared: ['shared=True', 'shared=False'] option_proxyfmu: ['proxyfmu=True', 'proxyfmu=False'] - + container: + image: gcc:${{ matrix.compiler_version }} + env: + CONAN_LOGIN_USERNAME_OSP: ${{ secrets.osp_artifactory_usr }} + CONAN_PASSWORD_OSP: ${{ secrets.osp_artifactory_pwd }} + LIBCOSIMC_RUN_TESTS_ON_CONAN_BUILD: 1 steps: - uses: actions/checkout@v4 - - name: Generate Dockerfile + - name: Install prerequisites + run: | + apt-get update + apt-get install -y pipx doxygen + pipx install conan cmake + echo "$HOME/.local/bin" >> "$GITHUB_PATH" + - name: Configure Conan run: | - mkdir /tmp/osp-builder-docker - cat <<'EOF' >/tmp/osp-builder-docker/Dockerfile - FROM conanio/gcc${{ matrix.compiler_version }}-ubuntu16.04 - ENV CONAN_LOGIN_USERNAME_OSP=${{ secrets.osp_artifactory_usr }} - ENV CONAN_PASSWORD_OSP=${{ secrets.osp_artifactory_pwd }} - ENV LIBCOSIMC_RUN_TESTS_ON_CONAN_BUILD=1 - COPY entrypoint.sh / - ENTRYPOINT /entrypoint.sh - EOF - - name: Generate entrypoint.sh + conan profile detect + conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local + - name: Conan create + shell: bash 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$(=3.15]", - "doxygen/1.9.1", + "cmake/[>=4.0]", ) requires = ( - "libcosim/0.11.0@osp/stable", + "libcosim/0.11.2@osp/stable", ) # Exports diff --git a/version.txt b/version.txt index af88ba8..bc859cb 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.11.1 +0.11.2