Skip to content

Commit 4d1ec55

Browse files
committed
Fixed CI workflow
1 parent 3dc8338 commit 4d1ec55

File tree

1 file changed

+17
-32
lines changed

1 file changed

+17
-32
lines changed

Diff for: .github/workflows/main.yml

+17-32
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ on:
44
push:
55
branches:
66
- main
7-
- master
87
pull_request:
98
branches:
109
- main
11-
- master
1210

1311
jobs:
1412
unix:
@@ -22,44 +20,38 @@ jobs:
2220

2321

2422
steps:
25-
- uses: actions/checkout@v2
26-
- name: Get number of CPU cores
27-
uses: SimenB/github-actions-cpu-cores@v1
23+
- uses: actions/checkout@v4
2824

29-
- name: install mamba
30-
uses: mamba-org/provision-with-micromamba@main
25+
- name: Install micromamba
26+
uses: mamba-org/setup-micromamba@v1
3127
with:
32-
environment-file: env.yml
33-
environment-name: xeusqt
28+
environment-file: environment-dev.yml
29+
environment-name: xeus-qt
3430

35-
- name: install cxx compiler
31+
- name: Create build directory
3632
shell: bash -l {0}
37-
run: |
38-
$HOME/micromamba-bin/micromamba install cxx-compiler libuuid -c conda-forge -y
33+
run: mkdir -p build
3934

4035
- name: cmake configure
4136
shell: bash -l {0}
4237
run: |
43-
mkdir -p build
44-
cd build
4538
cmake .. \
46-
-DXEUS_BUILD_TESTS=ON \
4739
-DCMAKE_PREFIX_PATH=$CONDA_PREFIX \
4840
-DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX
41+
working-directory: build
4942

5043
- name: build
5144
shell: bash -l {0}
5245
run: |
53-
cd build
5446
make -j 2
55-
# make -j ${{ steps.cpu-cores.outputs.count }}
47+
working-directory: build
5648

5749

5850
- name: install xeus-qt
5951
shell: bash -l {0}
6052
run: |
61-
cd build
6253
make install
54+
working-directory: build
6355

6456
win:
6557

@@ -71,39 +63,32 @@ jobs:
7163
os: [ windows-2019, windows-2022 ]
7264

7365
steps:
74-
- uses: actions/checkout@v2
66+
- uses: actions/checkout@v4
7567

7668
- name: install mamba
77-
uses: mamba-org/provision-with-micromamba@main
69+
uses: mamba-org/setup-micromamba@v1
7870
with:
79-
environment-file: env.yml
80-
environment-name: xeus
81-
82-
- name: micromamba shell hook
83-
shell: powershell
84-
run: |
85-
micromamba shell hook -s cmd.exe -p C:\Users\runneradmin\micromamba-root
71+
environment-file: environment-dev.yml
72+
environment-name: xeus-qt
73+
init-shell: cmd.exe
8674

8775
- name: Make build directory
8876
run: mkdir build
8977

9078
- name: cmake configure
91-
shell: cmd
79+
shell: cmd /C call {0}
9280
run: |
93-
call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xeus
9481
cmake .. ^
9582
-G Ninja ^
9683
-DCMAKE_BUILD_TYPE=Release ^
97-
-DXEUS_BUILD_TESTS=ON ^
9884
-DDEPENDENCY_SEARCH_PREFIX="%CONDA_PREFIX%\Library" ^
9985
-DCMAKE_PREFIX_PATH="%CONDA_PREFIX%\Library" ^
10086
-DCMAKE_INSTALL_PREFIX="%CONDA_PREFIX%"
10187
working-directory: build
10288

10389
- name: build
104-
shell: cmd
90+
shell: cmd /C call {0}
10591
run: |
106-
call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xeus
10792
set CL=/MP
10893
ninja install
10994
working-directory: build

0 commit comments

Comments
 (0)