Merge pull request #15 from JohanMabille/example

Build example dir in CI
jupyter-xeus · Jun 11, 2024 · 3c9c512 · 3c9c512
2 parents 5d702e3 + f869429
commit 3c9c512
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -45,14 +45,24 @@ jobs:
         run: |
           make -j 2
         working-directory: build
-
 
       - name: install xeus-qt
         shell: bash -l {0}
         run: |
           make install
         working-directory: build
 
+      #- name: build example kernel
+      #  shell: bash -l {0}
+      #  run: |
+      #    mkdir -p build
+      #    cd build
+      #    cmake .. \
+      #     -DCMAKE_PREFIX_PATH=$CONDA_PREFIX \
+      #     -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX 
+      #     make -j 2
+      #  working-directory: examples
+
   win:
 
     runs-on: ${{ matrix.os }}
@@ -86,10 +96,24 @@ jobs:
            -DCMAKE_INSTALL_PREFIX="%CONDA_PREFIX%"
         working-directory: build
 
-      - name: build
+      - name: build and install
         shell: cmd /C call {0}
         run: |
           set CL=/MP
           ninja install
         working-directory: build
 
+      #- name: build example kernel
+      #  shell: cmd /C call {0}
+      #  run: |
+      #    mkdir -p build
+      #    cd build
+      #    cmake .. ^
+      #     -G Ninja ^
+      #     -DCMAKE_BUILD_TYPE=Release ^
+      #     -DDEPENDENCY_SEARCH_PREFIX="%CONDA_PREFIX%\Library" ^
+      #     -DCMAKE_PREFIX_PATH="%CONDA_PREFIX%\Library" ^
+      #     -DCMAKE_INSTALL_PREFIX="%CONDA_PREFIX%"
+      #     make -j 2
+      #  working-directory: examples
+
diff --git a/environment-dev.yml b/environment-dev.yml
@@ -11,7 +11,8 @@ dependencies:
   - nlohmann_json =3.11.3
   - xeus-zmq >=3.0, <4.0
   - qt >= 5.12.9, <6
-  #- git
+  # Test dependencies
+  - xeus-lua
   - mesa-libgl-cos7-aarch64
   - mesa-libgl-cos6-x86_64
   - mesa-dri-drivers-cos6-x86_64 

diff --git a/examples/main.cpp b/examples/main.cpp
@@ -39,8 +39,6 @@ class MainWindow : public QMainWindow{
     : QMainWindow()
     {
         // zmq context
-        auto context = xeus::make_context<zmq::context_t>();
-
         std::unique_ptr<xeus::xcontext> context = xeus::make_zmq_context();
 
         // Create interpreter instance
@@ -54,7 +52,7 @@ class MainWindow : public QMainWindow{
         p_kernel.reset(new xeus::xkernel(xeus::get_user_name(),
                          std::move(context),
                          std::move(interpreter),
-                         make_xq_server,
+                         xeus::make_xq_server,
                          std::move(hist),
                          nullptr));