Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 22 additions & 26 deletions .github/workflows/ci-conan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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$(<version.txt)"
if [[ $GITHUB_REF == refs/tags/* ]] && [[ $REFNAME == $VERSION ]]; then CHANNEL="stable"
Expand All @@ -51,13 +51,9 @@ jobs:
--user=osp \
--channel="${CHANNEL}" \
.
conan upload --confirm --remote=osp 'libcosimc/*'
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 libcosimc
run: docker run --rm --env GITHUB_REF="$GITHUB_REF" -v $(pwd):/mnt/source:ro osp-builder
- name: Upload package
run: |
conan upload --confirm --remote=osp '*'

windows:
name: Windows
Expand Down Expand Up @@ -97,7 +93,7 @@ jobs:
fi
conan create \
--settings="build_type=${{ matrix.build_type }}" \
--options="libcosimc*:${{ matrix.option_shared }}" \
--options="libcosimc/*:${{ matrix.option_shared }}" \
--options="libcosim/*:${{ matrix.option_proxyfmu }}" \
--build=missing \
--user=osp \
Expand Down
5 changes: 2 additions & 3 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,10 @@ def configure(self):

# Dependencies/requirements
tool_requires = (
"cmake/[>=3.15]",
"doxygen/1.9.1",
"cmake/[>=4.0]",
)
requires = (
"libcosim/0.11.0@osp/stable",
"libcosim/0.11.2@osp/stable",
)

# Exports
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.11.1
0.11.2
Loading