Skip to content

Commit 2010451

Browse files
committed
Make CI more reliable
1 parent 75baf7d commit 2010451

File tree

6 files changed

+49
-48
lines changed

6 files changed

+49
-48
lines changed

.github/actions/setup-numba-dpex/action.yml

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,38 @@
11
name: Setup numba-dpex
22
description: 'Setup conda environment, build numba-dpex and setup devices'
33
inputs:
4-
environment:
4+
environment-file:
55
description: Environment file
66
required: true
7-
default: environment/dev.yml
7+
environment-name:
8+
description: Environment name
9+
default: work-env
10+
python-version:
11+
description: Python version
12+
default: 3.9
813
runs:
914
using: "composite"
1015
steps:
11-
- name: Setup conda
12-
run: echo $CONDA/bin >> $GITHUB_PATH
13-
shell: bash
14-
15-
- name: Setup conda environment
16-
run: conda env update -n base -f ${{ inputs.environment }} --prune
17-
shell: bash
16+
# NOTE: works faster without cache
17+
- uses: conda-incubator/setup-miniconda@v2
18+
with:
19+
python-version: ${{ inputs.python-version }}
20+
miniforge-variant: Mambaforge
21+
miniforge-version: latest
22+
activate-environment: "${{ inputs.environment-name }}"
23+
channel-priority: "disabled"
24+
environment-file: "${{ inputs.environment-file }}"
1825

1926
- name: Test conda environment
27+
shell: bash -l {0}
2028
run: conda list
21-
shell: bash
2229

2330
- name: Build numba-dpex
31+
shell: bash -l {0}
2432
run: |
2533
export PATH=$CONDA/bin-llvm:$PATH
2634
python setup.py develop
27-
shell: bash
2835
2936
- name: Setup OpenCL CPU device
37+
shell: bash -l {0}
3038
run: echo "OCL_ICD_FILENAMES=libintelocl.so" >> $GITHUB_ENV
31-
shell: bash

.github/workflows/coverage.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ jobs:
1212
main:
1313
name: Generate coverage and push to Coveralls.io
1414
runs-on: ubuntu-20.04
15-
15+
defaults:
16+
run:
17+
shell: bash -l {0}
1618
steps:
19+
1720
- name: Cancel Previous Runs
1821
uses: styfle/[email protected]
1922
with:
@@ -27,7 +30,7 @@ jobs:
2730
- name: Setup numba-dpex
2831
uses: ./.github/actions/setup-numba-dpex
2932
with:
30-
environment: environment/coverage.yml
33+
environment-file: environment/coverage.yml
3134

3235
- name: Test installation
3336
run: |

.github/workflows/gh-pages-tags.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
jobs:
1010
main:
1111
runs-on: ubuntu-latest
12+
defaults:
13+
run:
14+
shell: bash -l {0}
1215

1316
steps:
1417
- uses: actions/checkout@v3
@@ -18,7 +21,8 @@ jobs:
1821
- name: Setup numba-dpex
1922
uses: ./.github/actions/setup-numba-dpex
2023
with:
21-
environment: environment/docs.yml
24+
environment-file: environment/docs.yml
25+
python-version: '3.10'
2226

2327
- name: Make documentation
2428
working-directory: docs

.github/workflows/gh-pages.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ jobs:
1313
main:
1414
if: ${{ !(github.event.pull_request && github.event.action == 'closed') }}
1515
runs-on: ubuntu-latest
16+
defaults:
17+
run:
18+
shell: bash -l {0}
1619

1720
steps:
1821
- uses: actions/checkout@v3
@@ -22,7 +25,8 @@ jobs:
2225
- name: Setup numba-dpex
2326
uses: ./.github/actions/setup-numba-dpex
2427
with:
25-
environment: environment/docs.yml
28+
environment-file: environment/docs.yml
29+
python-version: '3.10'
2630

2731
- name: Make documentation
2832
working-directory: docs

environment/coverage.yml

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,19 @@ channels:
44
- numba
55
- intel
66
- numba/label/dev
7-
- pkgs/main
7+
- conda-forge
88
- nodefaults
99
dependencies:
10-
- python=3.9
11-
- defaults:libffi
10+
- libffi
1211
- gxx_linux-64
1312
- dpcpp_linux-64
14-
- numba 0.57*
15-
- dppy/label/dev:dpctl
16-
- dppy/label/dev:dpnp
13+
- numba=0.57
14+
- dpctl
15+
- dpnp
1716
- spirv-tools
1817
- dpcpp-llvm-spirv
19-
- packaging
18+
- coverage
2019
- pytest
21-
- pip
22-
- pip:
23-
- coverage
24-
- pre-commit
25-
- flake8
26-
- black==20.8b1
27-
- pytest-cov
28-
- pytest-xdist
29-
- pexpect
30-
variables:
31-
CHANNELS: -c defaults -c numba -c intel -c numba/label/dev -c dppy/label/dev --override-channels
32-
CHANNELS_DEV: -c dppy/label/dev -c defaults -c numba -c intel -c numba/label/dev --override-channels
20+
- pytest-cov
21+
- pytest-xdist
22+
- pexpect

environment/docs.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,22 @@ channels:
33
- dppy/label/dev
44
- numba
55
- intel
6+
- numba/label/dev
67
- conda-forge
78
- nodefaults
89
dependencies:
9-
- python=3.10
1010
- gxx_linux-64
1111
- dpcpp_linux-64
12-
- numba 0.57*
13-
- dpctl 0.14*
14-
- dpnp >=0.12*
12+
- numba=0.57
13+
- dpctl
14+
- dpnp
1515
- spirv-tools
1616
- dpcpp-llvm-spirv
17-
- packaging
18-
- pytest
1917
- pip
2018
- pip:
21-
- coverage
22-
- pre-commit
23-
- flake8
24-
- black==20.8b1
25-
- pexpect
2619
- sphinx
27-
- autodoc
20+
- autodoc # there is no conda package
2821
- recommonmark
2922
- sphinx-rtd-theme
3023
- sphinxcontrib-apidoc
31-
- sphinxcontrib-googleanalytics
24+
- sphinxcontrib-googleanalytics # there is no conda package

0 commit comments

Comments
 (0)