diff --git a/.github/workflows/ci-conan-gcc.yml b/.github/workflows/ci-conan-gcc.yml index 93de145..9b1bf48 100755 --- a/.github/workflows/ci-conan-gcc.yml +++ b/.github/workflows/ci-conan-gcc.yml @@ -40,7 +40,7 @@ jobs: image: ${{ matrix.linux }} options: -u 0 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Install prerequisites run: | apt-get update @@ -62,4 +62,4 @@ jobs: --user sintef --channel ${{ matrix.channel }} \ -b missing -b outdated -b "${{ env.pkg_name }}*" . - name: Conan upload - run: conan upload --confirm -r sintef "${{ env.pkg_name }}*" --force + run: conan upload --confirm -r sintef "${{ env.pkg_name }}*" diff --git a/.github/workflows/ci-conan-msvc.yml b/.github/workflows/ci-conan-msvc.yml index fd29061..db6d828 100755 --- a/.github/workflows/ci-conan-msvc.yml +++ b/.github/workflows/ci-conan-msvc.yml @@ -21,7 +21,7 @@ jobs: compiler_version: [192, 194] channel: ["${{ github.ref_type == 'tag' && 'stable' || 'testing' }}"] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Install prerequisites run: | pip3 install --upgrade setuptools pip @@ -41,4 +41,4 @@ jobs: --user sintef --channel ${{ matrix.channel }} ` -b missing -b outdated -b "${{ env.pkg_name }}*" . - name: Conan upload - run: conan upload --confirm -r sintef "${{ env.pkg_name }}*" --force + run: conan upload --confirm -r sintef "${{ env.pkg_name }}*" diff --git a/README.md b/README.md index cffdadb..39fb0b5 100644 --- a/README.md +++ b/README.md @@ -56,9 +56,10 @@ for CPPFMU that you can use in your code, but you still need to compile `fmi_functions.cpp`. The package can be created with `conan create . --user sintef --channel stable`. The recipe and some precompiled binaries are available on Sintef Ocean's public artifactory], which can be added with `conan remote add sintef-public -https://package.smd.sintef.no`. Note that when using the conan recipe, FMI 1 or 2 is added -as a dependency, so you do not need to fetch them yourself. To use CPPFMU with conan, add -the following lines to your `conanfile.py` and `CMakeLists.txt`: +https://gitlab.sintef.no/api/v4/projects/22218/packages/conan`. Note that when using the +conan recipe, FMI 1 or 2 is added as a dependency, so you do not need to fetch them +yourself. To use CPPFMU with conan, add the following lines to your `conanfile.py` +and `CMakeLists.txt`: `conanfile.py`: ```python diff --git a/version.txt b/version.txt index 9084fa2..524cb55 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.1.0 +1.1.1