diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35565f9..6438b1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,10 @@ jobs: run: conan create picotool -b missing --version=2.2.0 -pr:a hal/tc/llvm -c tools.build:sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk - if: ${{ startsWith(matrix.os, 'ubuntu') }} - run: sudo -E $(which conan) create picotool -b missing --version=2.2.0 -pr:a hal/tc/llvm -c tools.system.package_manager:mode=install + run: sudo apt-get install libusb libusb-dev + + - if: ${{ startsWith(matrix.os, 'ubuntu') }} + run: conan create picotool -b missing --version=2.2.0 -pr:a hal/tc/llvm - if: ${{ startsWith(matrix.os, 'windows') }} run: conan create picotool -b missing --version=2.2.0 -c tools.cmake.cmaketoolchain:generator="NMake Makefiles" diff --git a/picotool/conanfile.py b/picotool/conanfile.py index ae8bd5e..cffbc97 100644 --- a/picotool/conanfile.py +++ b/picotool/conanfile.py @@ -85,3 +85,7 @@ def build(self): def package(self): cmake = CMake(self) cmake.install() + + def package_id(self): + del self.info.settings.compiler + del self.info.settings.build_type \ No newline at end of file diff --git a/pioasm/conanfile.py b/pioasm/conanfile.py index edf8286..78e4e45 100644 --- a/pioasm/conanfile.py +++ b/pioasm/conanfile.py @@ -73,5 +73,6 @@ def package(self): cmake = CMake(self) cmake.install() - def package_info(self): - pass + def package_id(self): + del self.info.settings.compiler + del self.info.settings.build_type \ No newline at end of file