conan: macos

cppfw · Dec 3, 2024 · 439fae3 · 439fae3
1 parent 7fde0dd
commit 439fae3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -378,7 +378,7 @@ jobs:
           repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
           repo-name: cppfw
           keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
-          install: devscripts equivs myci prorab prorab-extra pipx cmake git clang-tidy
+          install: devscripts equivs myci pipx cmake git clang-tidy
       - name: add ~/.local/bin to PATH
         uses: myci-actions/export-env-var@main
         with: {name: PATH, value: "$PATH:$HOME/.local/bin"}
@@ -411,7 +411,8 @@ jobs:
         os:
           # - macos-10.15
           # - macos-11
-          - macos-12
+          # - macos-12
+          - macos-latest
     name: conan - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -431,14 +432,11 @@ jobs:
           brew tap cppfw/tap
           brew update
       - name: install ci tools
-        run: brew install myci prorab prorab-extra conan make
+        run: brew install myci conan
       - name: create default conan profile
         run: |
           conan profile detect --name default
           sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
-      - name: set PATH
-        uses: myci-actions/export-env-var@main
-        with: {name: PATH, value: "/usr/local/opt/make/libexec/gnubin:$PATH"}
       - name: GNU make version
         run: make --version
       - name: set PACKAGE_VERSION
@@ -448,7 +446,7 @@ jobs:
       - name: build
         run: |
           conan remote add cppfw $MYCI_CONAN_REMOTE
-          conan create conan --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
+          conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
       - name: deploy conan package
         run: |
           conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER

diff --git a/conan/conanfile.py b/conan/conanfile.py
@@ -17,11 +17,9 @@ class AggConan(ConanFile):
 	default_options = {"shared": False, "fPIC": True}
 	generators = "AutotoolsDeps" # this will set CXXFLAGS etc. env vars
 
-	# def requirements(self):
-	# 	self.requires("utki/[>=1.1.202]@cppfw/main", transitive_headers=True)
-
-	# def build_requirements(self):
-	# 	self.requires("tst/[>=0.3.29]@cppfw/main", visible=False)
+	def build_requirements(self):
+		self.tool_requires("prorab/[>=2.0.27]@cppfw/main")
+		self.tool_requires("prorab-extra/[>=0.2.57]@cppfw/main")
 
 	def config_options(self):
 		if self.settings.os == "Windows":
@@ -47,8 +45,8 @@ def source(self):
 		git.run("submodule update --init --remote --depth 1")
 
 	def build(self):
-		self.run("make lint=off")
-		self.run("make lint=off test")
+		self.run("make $MAKE_INCLUDE_DIRS_ARG lint=off")
+		self.run("make $MAKE_INCLUDE_DIRS_ARG lint=off test")
 
 	def package(self):
 		src_dir = os.path.join(self.build_folder, "src/agg/include/agg")