diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c6c0000..43af9f3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,7 +45,6 @@ jobs: run: | make -j 2 working-directory: build - - name: install xeus-qt shell: bash -l {0} @@ -53,6 +52,17 @@ jobs: 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 index cac88f6..59f4134 100644 --- 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 index 48dad10..90c93a7 100644 --- a/examples/main.cpp +++ b/examples/main.cpp @@ -39,8 +39,6 @@ class MainWindow : public QMainWindow{ : QMainWindow() { // zmq context - auto context = xeus::make_context(); - std::unique_ptr 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));