Skip to content

Commit 80f35ea

Browse files
igagisigagis
committed
conan: macos
1 parent 98b8f0f commit 80f35ea

2 files changed

Lines changed: 60 additions & 58 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 54 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ jobs:
392392
repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
393393
repo-name: cppfw
394394
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
395-
install: devscripts equivs myci prorab prorab-extra pipx cmake git
395+
install: devscripts equivs myci pipx cmake git
396396
- name: add ~/.local/bin to PATH
397397
uses: myci-actions/export-env-var@main
398398
with: {name: PATH, value: "$PATH:$HOME/.local/bin"}
@@ -419,58 +419,56 @@ jobs:
419419
conan upload --check --remote cppfw $PACKAGE_NAME/$PACKAGE_VERSION@$MYCI_CONAN_USER/main
420420
if: startsWith(github.ref, 'refs/tags/')
421421
##### conan - macosx #####
422-
# conan-macosx:
423-
# strategy:
424-
# fail-fast: false
425-
# matrix:
426-
# os:
427-
# # - macos-10.15
428-
# # - macos-11
429-
# - macos-12
430-
# name: conan - ${{ matrix.os }}
431-
# runs-on: ${{ matrix.os }}
432-
# steps:
433-
# - name: workaround python2 and python3 issue when upgrading python
434-
# run : |
435-
# rm -rf /usr/local/bin/2to3*
436-
# rm -rf /usr/local/bin/idle3*
437-
# rm -rf /usr/local/bin/pydoc3*
438-
# rm -rf /usr/local/bin/python3
439-
# rm -rf /usr/local/bin/python3-config
440-
# rm -rf /usr/local/bin/python3*
441-
# rm -rf /usr/local/bin/python3*-config
442-
# - name: git clone
443-
# uses: myci-actions/checkout@main
444-
# - name: install clang-tidy and clang-format
445-
# run: |
446-
# brew install llvm
447-
# ln -s "$(brew --prefix llvm)/bin/clang-format" "/usr/local/bin/clang-format"
448-
# ln -s "$(brew --prefix llvm)/bin/clang-tidy" "/usr/local/bin/clang-tidy"
449-
# ln -s "$(brew --prefix llvm)/bin/clang-apply-replacements" "/usr/local/bin/clang-apply-replacements"
450-
# - name: add cppfw tap
451-
# run: |
452-
# brew tap cppfw/tap
453-
# brew update
454-
# - name: install ci tools
455-
# run: brew install myci prorab prorab-extra conan make
456-
# - name: create default conan profile
457-
# run: |
458-
# conan profile detect --name default
459-
# sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
460-
# - name: set PATH to use latest make
461-
# uses: myci-actions/export-env-var@main
462-
# with: {name: PATH, value: "/usr/local/opt/make/libexec/gnubin:$PATH"}
463-
# - name: set PACKAGE_VERSION
464-
# uses: myci-actions/export-env-var@main
465-
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
466-
# if: startsWith(github.ref, 'refs/tags/')
467-
# - name: build
468-
# run: |
469-
# conan remote add cppfw $MYCI_CONAN_REMOTE
470-
# conan cache clean
471-
# conan create conan --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --update
472-
# - name: deploy conan package
473-
# run: |
474-
# conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
475-
# conan upload --check --remote cppfw $PACKAGE_NAME/$PACKAGE_VERSION@$MYCI_CONAN_USER/main
476-
# if: startsWith(github.ref, 'refs/tags/')
422+
conan-macosx:
423+
strategy:
424+
fail-fast: false
425+
matrix:
426+
os:
427+
# - macos-10.15
428+
# - macos-11
429+
# - macos-12
430+
- macos-latest
431+
name: conan - ${{ matrix.os }}
432+
runs-on: ${{ matrix.os }}
433+
steps:
434+
- name: workaround python2 and python3 issue when upgrading python
435+
run : |
436+
rm -rf /usr/local/bin/2to3*
437+
rm -rf /usr/local/bin/idle3*
438+
rm -rf /usr/local/bin/pydoc3*
439+
rm -rf /usr/local/bin/python3
440+
rm -rf /usr/local/bin/python3-config
441+
rm -rf /usr/local/bin/python3*
442+
rm -rf /usr/local/bin/python3*-config
443+
- name: git clone
444+
uses: myci-actions/checkout@main
445+
- name: install clang-tidy and clang-format
446+
run: |
447+
brew install llvm
448+
ln -s "$(brew --prefix llvm)/bin/clang-format" "/usr/local/bin/clang-format"
449+
ln -s "$(brew --prefix llvm)/bin/clang-tidy" "/usr/local/bin/clang-tidy"
450+
ln -s "$(brew --prefix llvm)/bin/clang-apply-replacements" "/usr/local/bin/clang-apply-replacements"
451+
- name: add cppfw tap
452+
run: |
453+
brew tap cppfw/tap
454+
brew update
455+
- name: install ci tools
456+
run: brew install myci conan
457+
- name: create default conan profile
458+
run: |
459+
conan profile detect --name default
460+
sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
461+
- name: set PACKAGE_VERSION
462+
uses: myci-actions/export-env-var@main
463+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
464+
if: startsWith(github.ref, 'refs/tags/')
465+
- name: build
466+
run: |
467+
conan remote add cppfw $MYCI_CONAN_REMOTE
468+
conan cache clean
469+
conan create conan --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --update
470+
- name: deploy conan package
471+
run: |
472+
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
473+
conan upload --check --remote cppfw $PACKAGE_NAME/$PACKAGE_VERSION@$MYCI_CONAN_USER/main
474+
if: startsWith(github.ref, 'refs/tags/')

‎conan/conanfile.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ def requirements(self):
2222
self.requires("clargs/[>=0.2.47]@cppfw/main", transitive_headers=True, transitive_libs=True)
2323
self.requires("nitki/[>=0.0.0]@cppfw/main", transitive_headers=False, transitive_libs=True)
2424

25+
def build_requirements(self):
26+
self.tool_requires("prorab/[>=2.0.27]@cppfw/main")
27+
self.tool_requires("prorab-extra/[>=0.2.57]@cppfw/main")
28+
2529
def config_options(self):
2630
if self.settings.os == "Windows":
2731
del self.options.fPIC
@@ -46,8 +50,8 @@ def source(self):
4650
git.run("submodule update --init --remote --depth 1")
4751

4852
def build(self):
49-
self.run("make lint=off")
50-
self.run("make lint=off test")
53+
self.run("make $MAKE_INCLUDE_DIRS_ARG lint=off")
54+
self.run("make $MAKE_INCLUDE_DIRS_ARG lint=off test")
5155

5256
def package(self):
5357
src_dir = os.path.join(self.build_folder, "src")

0 commit comments

Comments
 (0)