Skip to content

Commit cb234b0

Browse files
committed
Add comments, Remove unnecessary code
1 parent 58a77ab commit cb234b0

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,6 @@ jobs:
7474
run: |
7575
micromamba shell hook -s cmd.exe -p C:\Users\runneradmin\micromamba-root
7676
77-
- name: activate environment
78-
if: ${{ runner.os != 'windows' }}
79-
shell: bash -l {0}
80-
run: |
81-
micromamba activate xeus-cpp
82-
8377
- name: install cxx compiler
8478
if: ${{ runner.os != 'windows' }}
8579
shell: bash -l {0}
@@ -124,17 +118,13 @@ jobs:
124118
cd build
125119
make install -j ${{ env.ncpus }}
126120
127-
# - name: Setup tmate session
128-
# if: ${{ runner.os != 'windows' }}
129-
# uses: mxschmitt/action-tmate@v3
130-
131121
- name: Test xeus-cpp C++ Unix Systems
132122
if: ${{ runner.os != 'windows' }}
133123
shell: bash -l {0}
134124
run: |
135125
cd build/test
136126
./test_xeus_cpp
137-
timeout-minutes: 30
127+
timeout-minutes: 4
138128

139129
- name: Test xeus-cpp C++ Windows Systems
140130
if: ${{ runner.os == 'windows' }}

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ macro(xeus_cpp_create_target target_name linkage output_name)
312312
set(XEUS_CPP_XEUS_TARGET xeus-static)
313313
endif ()
314314

315+
#This is a workaround for the issue with the libcurl target on Windows specifically for xassist
315316
if(WIN32)
316317
# Set the MSVC runtime library
317318
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
@@ -338,6 +339,7 @@ macro(xeus_cpp_create_target target_name linkage output_name)
338339
target_compile_options(${target_name} PRIVATE "/MD$<$<CONFIG:Debug>:d>")
339340
endif()
340341
else()
342+
# Curl initialised specifically for xassist
341343
target_link_libraries(${target_name} PUBLIC ${XEUS_CPP_XEUS_TARGET} clangCppInterOp pugixml argparse::argparse curl)
342344
endif()
343345

environment-wasm-build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ channels:
44
dependencies:
55
- cmake
66
- emsdk >=3.1.11
7-
- empack >=2.0.1
8-
- curl
7+
- empack >=2.0.1

src/xmagics/xassist.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
using json = nlohmann::json;
2121

22+
// TODO: Implement xplugin to seperate the magics from the main code.
23+
// TODO: Add support for open-source models.
2224
namespace xcpp
2325
{
2426
class APIKeyManager

0 commit comments

Comments
 (0)