Merge pull request #263 from JohanMabille/ci

Updated CI and README badges
jupyter-xeus · May 31, 2024 · ad4bb9e · ad4bb9e
2 parents b8c88bf + 3b554ea
commit ad4bb9e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 27 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: pre-commit/[email protected]
 
   unix:
@@ -29,26 +29,26 @@ jobs:
         os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - name: Install mamba
-      uses: mamba-org/provision-with-micromamba@main
+    - name: Get number of CPU cores
+      uses: SimenB/github-actions-cpu-cores@v2
+
+    - name: Install micromamba
+      uses: mamba-org/setup-micromamba@v1
       with:
         environment-file: environment-dev.yml
-        environment-name: xwidgets
 
     - name: Cmake configure
-      shell: bash -l -eo pipefail {0}
-      run: >
-        cmake -B build -Werror=dev
-        ${CMAKE_ARGS}
-        -D CMAKE_BUILD_TYPE=Release
-        -D XWIDGETS_BUILD_TESTS=ON
-        -D CMAKE_PREFIX_PATH="${CONDA_PREFIX}"
+      run: |
+        cmake -B build -Werror=dev \
+        ${CMAKE_ARGS} \
+        -D CMAKE_BUILD_TYPE=Release \
+        -D XWIDGETS_BUILD_TESTS=ON \
+        -D CMAKE_PREFIX_PATH="${CONDA_PREFIX}" \
         -D CMAKE_INSTALL_PREFIX="${CONDA_PREFIX}"
 
     - name: Build
-      shell: bash -l -eo pipefail {0}
       run: cmake --build build/ --parallel 2
 
     - name: Test xwidgets
@@ -82,27 +82,20 @@ jobs:
         os: [windows-2019, windows-2022]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - name: install mamba
-      uses: mamba-org/provision-with-micromamba@main
+    - name: Install micromamba
+      uses: mamba-org/setup-micromamba@v1
       with:
+        init-shell: cmd.exe
         environment-file: environment-dev.yml
-        environment-name: xwidgets
-
-    - 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 /C call {0}
       run: |
-        call micromamba activate xwidgets
-        if %errorlevel% neq 0 exit /b %errorlevel%
         cmake -B build -Werror=dev ^
          -G Ninja ^
          -D CMAKE_BUILD_TYPE=Release ^
@@ -125,6 +118,5 @@ jobs:
         max_attempts: 4
         shell: cmd
         command: |
-          call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xwidgets
           set PATH=%CONDA_PREFIX%;%CONDA_PREFIX%\\Scripts;%CONDA_PREFIX%\\Library;%CONDA_PREFIX%\\Library\\bin;%PATH%
           ctest --test-dir build/test --output-on-failure
diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 # ![xwidgets](docs/source/xwidgets.svg)
 
-[![Azure Pipelines](https://dev.azure.com/jupyter-xeus/jupyter-xeus/_apis/build/status/jupyter-xeus.xwidgets?branchName=master)](https://dev.azure.com/jupyter-xeus/jupyter-xeus/_build/latest?definitionId=6&branchName=master)
-[![Appveyor](https://ci.appveyor.com/api/projects/status/kjoatvulm28dpr3r?svg=true)](https://ci.appveyor.com/project/jupyter-xeus/xwidgets)
+[![GithubActions](https://github.com/jupyter-xeus/xwidgets/actions/workflows/main.yml/badge.svg)](https://github.com/jupyter-xeus/xwidgets/actions/workflows/main.yml)
 [![Documentation](http://readthedocs.org/projects/xwidgets/badge/?version=latest)](https://xwidgets.readthedocs.io/en/latest/?badge=latest)
 [![Binder](https://img.shields.io/badge/launch-binder-brightgreen.svg)](https://mybinder.org/v2/gh/jupyter-xeus/xwidgets/stable?filepath=notebooks/xwidgets.ipynb)
 [![Join the Gitter Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/QuantStack/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)