diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2f568f36..6f3a01c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -70,7 +70,7 @@ jobs: os: [ windows-latest] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: install mamba uses: mamba-org/provision-with-micromamba@main @@ -84,17 +84,20 @@ jobs: micromamba shell hook -s cmd.exe -p C:\Users\runneradmin\micromamba-root - name: cmake configure - shell: powershell + shell: cmd run: | + call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xeus-cpp mkdir -p bld cd bld - cmake .. -DCMAKE_BUILD_TYPE=Release -DDEPENDENCY_SEARCH_PREFIX="%CONDA_PREFIX%\Library" -DCMAKE_PREFIX_PATH="%CONDA_PREFIX%\Library" -DCMAKE_INSTALL_PREFIX="%CONDA_PREFIX%" + cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DXEUS_BUILD_TESTS=ON -DDEPENDENCY_SEARCH_PREFIX="%CONDA_PREFIX%\Library" -DCMAKE_PREFIX_PATH="%CONDA_PREFIX%\Library" -DCMAKE_INSTALL_PREFIX="%CONDA_PREFIX%" - name: build - shell: powershell + shell: cmd run: | + call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xeus-cpp cd bld - cmake --build . --config Release --target ALL_BUILD + set CL=/MP + nmake install - name: test shell: cmd @@ -103,61 +106,6 @@ jobs: cd test pytest . --reruns 5 - # win: - - # runs-on: ${{ matrix.os }} - - # strategy: - # fail-fast: false - # matrix: - # os: [ windows-latest] - - # steps: - # - uses: actions/checkout@v2 - - # - name: install mamba - # uses: mamba-org/provision-with-micromamba@main - # with: - # environment-file: environment-dev.yml - # environment-name: xeus-cpp - - # - name: micromamba shell hook - # shell: powershell - # run: | - # micromamba shell hook -s cmd.exe -p C:\Users\runneradmin\micromamba-root - - # - name: Make build directory - # run: mkdir build - - # - name: cmake configure - # shell: cmd - # run: | - # call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xeus-cpp - # cmake .. ^ - # -GNinja ^ - # -DCMAKE_BUILD_TYPE=Release ^ - # -DXEUS_BUILD_TESTS=ON ^ - # -DDEPENDENCY_SEARCH_PREFIX="%CONDA_PREFIX%\Library" ^ - # -DCMAKE_PREFIX_PATH="%CONDA_PREFIX%\Library" ^ - # -DCMAKE_INSTALL_PREFIX="%CONDA_PREFIX%" - # working-directory: build - - # - name: build - # shell: cmd - # run: | - # call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xeus-cpp - # cd bld - # set CL=/MP - # ninja install - # working-directory: build - - # - name: test - # shell: cmd - # run: | - # call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xeus-cpp - # cd test - # pytest . --reruns 5 - emscripten_wasm: runs-on: ubuntu-latest