Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Uploading artifacts to jfrog #751

Merged
merged 2 commits into from
Feb 15, 2024
Merged

Conversation

davidhjp01
Copy link
Contributor

gcc9 builds are not available from conancenter. Built libraries are uploaded to osp jfrog.

@davidhjp01 davidhjp01 merged commit 6a5920e into feature/conan-2 Feb 15, 2024
20 checks passed
@davidhjp01 davidhjp01 deleted the feature/conan-2-test branch February 15, 2024 06:46
davidhjp01 added a commit that referenced this pull request Feb 19, 2024
* Upgrade to Conan 2

This fixes issue #718 (and incidentally fixes #702 too).

The modified `<gsl/util>` imports and various changes from `int` to
`std::size_t` are a consequence of using a newer version of MS GSL. I
changed the dependency version so we can use an upstream CMake package
configuration file which is compatible with the one generated by Conan
2's `CMakeDeps` generator. This should enable us to use the same
`find_package()` commands and target names regardless of whether the
build is running under Conan or not.

This also removes the ability to run Conan from within CMake, because
upstream hasn't released a version of the cmake-conan helper script with
full support for all Conan 2 features yet. (Notably, support for the
`CMakeToolchain` generator is missing.)

* Update GH Actions workflows for Conan 2

* Use a conanio Docker image that has Conan 2

* Run pure-CMake CI build in Docker, drop Windows

* Fix minor mistake in workflow file

* Fix more small mistakes in CI

* More legible build matrix elements in non-Conan CI

* Ensure that libdl is listed as a dependency of fmilib::shared

* Also import proxyfmu executable to the build directory

* Update version numbers in README

* Clean up GitHub Actions workflows a bit

* Set the cpp_info property `cmake_target_name` as `libcosim::cosim` in the `package_info` method.

This is because otherwise CMakeDeps incorrectly generates the dependency in the target cmake file as `libcosim::libcosim`. (i.e. <consumer>-Target-release.cmake, see https://docs.conan.io/2/reference/tools/cmake/cmakedeps.html#generated-files). This would not be found via `find_package(libcosim REQUIRED)`.

* Uploading artifacts to jfrog (#751)

gcc9 builds are not available from conancenter. Built libraries are uploaded to osp jfrog.

* Updated proxyfmu

* Updated version.txt to 0.10.3

---------

Co-authored-by: David Heejong Park <hee.jong.park@dnv.com>
Co-authored-by: David Heejong Park <88651540+davidhjp01@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant