Skip to content

Commit ad4bb9e

Browse files
authored
Merge pull request #263 from JohanMabille/ci
Updated CI and README badges
2 parents b8c88bf + 3b554ea commit ad4bb9e

File tree

2 files changed

+18
-27
lines changed

2 files changed

+18
-27
lines changed

.github/workflows/main.yml

+17-25
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
pre-commit:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- uses: pre-commit/[email protected]
2222

2323
unix:
@@ -29,26 +29,26 @@ jobs:
2929
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
3030

3131
steps:
32-
- uses: actions/checkout@v3
32+
- uses: actions/checkout@v4
3333

34-
- name: Install mamba
35-
uses: mamba-org/provision-with-micromamba@main
34+
- name: Get number of CPU cores
35+
uses: SimenB/github-actions-cpu-cores@v2
36+
37+
- name: Install micromamba
38+
uses: mamba-org/setup-micromamba@v1
3639
with:
3740
environment-file: environment-dev.yml
38-
environment-name: xwidgets
3941

4042
- name: Cmake configure
41-
shell: bash -l -eo pipefail {0}
42-
run: >
43-
cmake -B build -Werror=dev
44-
${CMAKE_ARGS}
45-
-D CMAKE_BUILD_TYPE=Release
46-
-D XWIDGETS_BUILD_TESTS=ON
47-
-D CMAKE_PREFIX_PATH="${CONDA_PREFIX}"
43+
run: |
44+
cmake -B build -Werror=dev \
45+
${CMAKE_ARGS} \
46+
-D CMAKE_BUILD_TYPE=Release \
47+
-D XWIDGETS_BUILD_TESTS=ON \
48+
-D CMAKE_PREFIX_PATH="${CONDA_PREFIX}" \
4849
-D CMAKE_INSTALL_PREFIX="${CONDA_PREFIX}"
4950
5051
- name: Build
51-
shell: bash -l -eo pipefail {0}
5252
run: cmake --build build/ --parallel 2
5353

5454
- name: Test xwidgets
@@ -82,27 +82,20 @@ jobs:
8282
os: [windows-2019, windows-2022]
8383

8484
steps:
85-
- uses: actions/checkout@v2
85+
- uses: actions/checkout@v4
8686

87-
- name: install mamba
88-
uses: mamba-org/provision-with-micromamba@main
87+
- name: Install micromamba
88+
uses: mamba-org/setup-micromamba@v1
8989
with:
90+
init-shell: cmd.exe
9091
environment-file: environment-dev.yml
91-
environment-name: xwidgets
92-
93-
- name: micromamba shell hook
94-
shell: powershell
95-
run: |
96-
micromamba shell hook -s cmd.exe -p C:\Users\runneradmin\micromamba-root
9792

9893
- name: Make build directory
9994
run: mkdir build
10095

10196
- name: Cmake configure
10297
shell: cmd /C call {0}
10398
run: |
104-
call micromamba activate xwidgets
105-
if %errorlevel% neq 0 exit /b %errorlevel%
10699
cmake -B build -Werror=dev ^
107100
-G Ninja ^
108101
-D CMAKE_BUILD_TYPE=Release ^
@@ -125,6 +118,5 @@ jobs:
125118
max_attempts: 4
126119
shell: cmd
127120
command: |
128-
call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xwidgets
129121
set PATH=%CONDA_PREFIX%;%CONDA_PREFIX%\\Scripts;%CONDA_PREFIX%\\Library;%CONDA_PREFIX%\\Library\\bin;%PATH%
130122
ctest --test-dir build/test --output-on-failure

README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# ![xwidgets](docs/source/xwidgets.svg)
22

3-
[![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)
4-
[![Appveyor](https://ci.appveyor.com/api/projects/status/kjoatvulm28dpr3r?svg=true)](https://ci.appveyor.com/project/jupyter-xeus/xwidgets)
3+
[![GithubActions](https://github.com/jupyter-xeus/xwidgets/actions/workflows/main.yml/badge.svg)](https://github.com/jupyter-xeus/xwidgets/actions/workflows/main.yml)
54
[![Documentation](http://readthedocs.org/projects/xwidgets/badge/?version=latest)](https://xwidgets.readthedocs.io/en/latest/?badge=latest)
65
[![Binder](https://img.shields.io/badge/launch-binder-brightgreen.svg)](https://mybinder.org/v2/gh/jupyter-xeus/xwidgets/stable?filepath=notebooks/xwidgets.ipynb)
76
[![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)

0 commit comments

Comments
 (0)