Skip to content

Commit f10de31

Browse files
committed
Do maintenance update CI
1 parent a0dff4b commit f10de31

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

.github/workflows/ci-conan-gcc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
image: ${{ matrix.linux }}
4141
options: -u 0
4242
steps:
43-
- uses: actions/checkout@v4
43+
- uses: actions/checkout@v6
4444
- name: Install prerequisites
4545
run: |
4646
apt-get update
@@ -62,4 +62,4 @@ jobs:
6262
--user sintef --channel ${{ matrix.channel }} \
6363
-b missing -b outdated -b "${{ env.pkg_name }}*" .
6464
- name: Conan upload
65-
run: conan upload --confirm -r sintef "${{ env.pkg_name }}*" --force
65+
run: conan upload --confirm -r sintef "${{ env.pkg_name }}*"

.github/workflows/ci-conan-msvc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
compiler_version: [192, 194]
2222
channel: ["${{ github.ref_type == 'tag' && 'stable' || 'testing' }}"]
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v6
2525
- name: Install prerequisites
2626
run: |
2727
pip3 install --upgrade setuptools pip
@@ -41,4 +41,4 @@ jobs:
4141
--user sintef --channel ${{ matrix.channel }} `
4242
-b missing -b outdated -b "${{ env.pkg_name }}*" .
4343
- name: Conan upload
44-
run: conan upload --confirm -r sintef "${{ env.pkg_name }}*" --force
44+
run: conan upload --confirm -r sintef "${{ env.pkg_name }}*"

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,10 @@ for CPPFMU that you can use in your code, but you still need to compile
5656
`fmi_functions.cpp`. The package can be created with `conan create . --user sintef
5757
--channel stable`. The recipe and some precompiled binaries are available on Sintef
5858
Ocean's public artifactory], which can be added with `conan remote add sintef-public
59-
https://package.smd.sintef.no`. Note that when using the conan recipe, FMI 1 or 2 is added
60-
as a dependency, so you do not need to fetch them yourself. To use CPPFMU with conan, add
61-
the following lines to your `conanfile.py` and `CMakeLists.txt`:
59+
https://gitlab.sintef.no/api/v4/projects/22218/packages/conan`. Note that when using the
60+
conan recipe, FMI 1 or 2 is added as a dependency, so you do not need to fetch them
61+
yourself. To use CPPFMU with conan, add the following lines to your `conanfile.py`
62+
and `CMakeLists.txt`:
6263

6364
`conanfile.py`:
6465
```python

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.0
1+
1.1.1

0 commit comments

Comments
 (0)