File tree Expand file tree Collapse file tree 4 files changed +8
-5
lines changed
Expand file tree Collapse file tree 4 files changed +8
-5
lines changed Original file line number Diff line number Diff line change 2424jobs :
2525 package_and_upload_all_check :
2626 uses : libhal/ci/.github/workflows/package_and_upload_all.yml@5.x.y
27+ with :
28+ modules_support_needed : true
2729 secrets : inherit
Original file line number Diff line number Diff line change 2626 with :
2727 version : ${{ github.ref_name }}
2828 remote_url : https://libhal.jfrog.io/artifactory/api/conan/trunk-conan
29+ modules_support_needed : true
2930 secrets :
3031 conan_remote_password : ${{ secrets.JFROG_LIBHAL_TRUNK_ID_TOKEN }}
3132 conan_remote_user : ${{ secrets.JFROG_LIBHAL_TRUNK_ID_TOKEN_USER }}
Original file line number Diff line number Diff line change @@ -84,13 +84,12 @@ def validate(self):
8484 self ._validate_compiler_version ()
8585
8686 def build_requirements (self ):
87- # Provides CMake, Ninja, & toolchain scripts for enabling modules
88- self .tool_requires ("cmake-modules-toolchain/1.0.3 " )
87+ self . tool_requires ( "cmake/[^4.0.0]" )
88+ self .tool_requires ("ninja/[^1.3.0] " )
8989 self .test_requires ("boost-ext-ut/2.3.1" )
9090
9191 def requirements (self ):
92- self .requires ("strong_ptr/0.0.0" , transitive_libs = True ,
93- transitive_headers = True )
92+ self .requires ("strong_ptr/0.0.2" )
9493
9594 def layout (self ):
9695 cmake_layout (self )
Original file line number Diff line number Diff line change @@ -25,7 +25,8 @@ class TestPackageConan(ConanFile):
2525 generators = "VirtualRunEnv"
2626
2727 def build_requirements (self ):
28- self .tool_requires ("cmake-modules-toolchain/1.0.3" )
28+ self .tool_requires ("cmake/[^4.0.0]" )
29+ self .tool_requires ("ninja/[^1.3.0]" )
2930
3031 def requirements (self ):
3132 self .requires (self .tested_reference_str )
You can’t perform that action at this time.
0 commit comments