Skip to content

Commit fce069e

Browse files
committed
Removed wasm profiles and use conan-toolchains ones
1 parent 239b6dd commit fce069e

File tree

10 files changed

+18
-92
lines changed

10 files changed

+18
-92
lines changed

.github/workflows/ros-tests.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ jobs:
1818
- name: Checkout repository
1919
uses: actions/checkout@v3
2020

21-
- name: Update ROS signing key (per ROS migration guide)
22-
run: |
23-
sudo rm /usr/share/keyrings/ros2-latest-archive-keyring.gpg
24-
sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros2-latest-archive-keyring.gpg
25-
2621
- name: Configure environment and install Conan release
2722
run: |
2823
apt-get update && apt-get install -y python3 python3-pip
@@ -44,10 +39,10 @@ jobs:
4439
- name: Checkout repository
4540
uses: actions/checkout@v3
4641

47-
- name: Update ROS signing key (per ROS migration guide)
48-
run: |
49-
sudo rm /usr/share/keyrings/ros2-latest-archive-keyring.gpg
50-
sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros2-latest-archive-keyring.gpg
42+
# - name: Update ROS signing key (per ROS migration guide)
43+
# run: |
44+
# sudo rm /usr/share/keyrings/ros2-latest-archive-keyring.gpg
45+
# sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros2-latest-archive-keyring.gpg
5146

5247
- name: Configure environment and install Conan from develop2 branch
5348
run: |

examples/cross_build/emscripten/bindings/ci_test_example.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import os
22
from test.examples_tools import run
33

4-
run("conan build . --build=missing --profile:host ../profiles/wasm32")
4+
run('conan config install https://github.com/perseoGI/conan-toolchains.git -sf conan_config --args "-b pgi/new/emsdk"')
5+
run("conan build . --build=missing --profile:host emsdk/wasm32")
56

67
assert os.path.exists(os.path.join("build", "release-wasm", "wasm_example.html"))
78
assert os.path.exists(os.path.join("build", "release-wasm", "wasm_example.js"))

examples/cross_build/emscripten/profiles/asmjs

Lines changed: 0 additions & 8 deletions
This file was deleted.

examples/cross_build/emscripten/profiles/emsdk-base

Lines changed: 0 additions & 28 deletions
This file was deleted.

examples/cross_build/emscripten/profiles/emsdk-native

Lines changed: 0 additions & 15 deletions
This file was deleted.

examples/cross_build/emscripten/profiles/wasm32

Lines changed: 0 additions & 10 deletions
This file was deleted.

examples/cross_build/emscripten/profiles/wasm64

Lines changed: 0 additions & 13 deletions
This file was deleted.

examples/cross_build/emscripten/wasm64/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
This basic example aims to show the differences between cross compiling a project with `arch=wasm` (which stands for `wasm32` bits)
55
and `arch=wasm64` the newly introduced architecture which supports WebAssembly 64-bits.
66

7+
To
78

89
To compile the project in 32 bits follow this instructions:
910

1011
```sh
11-
$ conan build . -pr ../profiles/wasm32
12+
$ conan build . -pr emsdk/wasm32
1213
$ node build/release-wasm/wasm-alloc.js
1314

1415
Current allocated: 1 GiB
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import platform
22
from test.examples_tools import chdir, run
33

4-
run("conan build . --build=missing --profile:host ../profiles/wasm32")
5-
# wasm64 not yet added to conan-io: https://github.com/conan-io/conan/pull/18400
6-
# run("conan build . --build=missing --profile:host ../profiles/wasm64")
4+
run('conan config install https://github.com/perseoGI/conan-toolchains.git -sf conan_config --args "-b pgi/new/emsdk"')
5+
run("conan build . --build=missing --profile:host emsdk/wasm32")
6+
run("conan build . --build=missing --profile:host emsdk/wasm64")
77

88
if platform.system() == "Windows":
99
with chdir("build"):
10-
run("generators\\conanbuild.bat && node --version && node release-wasm\\wasm-alloc.js")
10+
run("generators\\conanbuild.bat && node --version && node release-wasm\\wasm-alloc")
1111
# Needs at least Node.js 24.0.0
12-
# run("generators\\conanbuild.bat && node --version && node release-wasm64\\wasm-alloc.js")
12+
# run("generators\\conanbuild.bat && node --version && node release-wasm64\\wasm-alloc")
1313
else:
1414
with chdir("build/release-wasm"):
15-
run(". generators/conanbuild.sh && node --version && node wasm-alloc.js")
15+
run(". generators/conanbuild.sh && node --version && node wasm-alloc")
1616

1717
# Needs at least Node.js 24.0.0
1818
# with chdir("build/release-wasm64"):
19-
# run(". generators/conanbuild.sh && node --version && node wasm-alloc.js")
19+
# run(". generators/conanbuild.sh && node --version && node wasm-alloc")
2020

examples/cross_build/emscripten/wasm64/conanfile.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ class WasmAllocatorRecipe(ConanFile):
1111
def layout(self):
1212
cmake_layout(self)
1313

14+
def requirements(self):
15+
self.requires("icu/74.2")
16+
1417
def generate(self):
1518
deps = CMakeDeps(self)
1619
deps.generate()

0 commit comments

Comments
 (0)