Skip to content

Commit 22530f9

Browse files
committed
conan 4
1 parent 28eda79 commit 22530f9

3 files changed

Lines changed: 12 additions & 1 deletion

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ jobs:
463463
run: |
464464
conan remote add cppfw $MYCI_CONAN_REMOTE
465465
# NOTE: specifying empty test folder to skip the test stage
466-
conan create build/conan --profile:build default --profile:host emscripten/conan.profile --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --test-folder ""
466+
conan create build/conan --profile:build default --profile:host build/emscripten/conan.profile --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --test-folder ""
467467
- name: deploy conan package
468468
run: |
469469
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER

build/conan/conanfile.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class RuisappConan(ConanFile):
1919

2020
def requirements(self):
2121
self.requires("ruis/[>=0.5.270]@cppfw/main", transitive_headers=True, transitive_libs=True)
22+
self.requires("papki/[>=0.0.0]@cppfw/main", transitive_headers=True, transitive_libs=True)
2223

2324
def build_requirements(self):
2425
if self.settings.os != "Emscripten":

build/emscripten/conan.profile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[settings]
2+
os=Emscripten
3+
arch=wasm
4+
compiler=clang
5+
compiler.version=15
6+
compiler.libcxx=libc++
7+
build_type=Release
8+
9+
[tool_requires]
10+
emsdk/[>=3.1.72]

0 commit comments

Comments
 (0)