Skip to content

Commit bd1a414

Browse files
authored
Reorder channels in conda-build (#1182)
* Reorder channels in conda-build * Remove conda-build script for Linux
1 parent 5f87d3a commit bd1a414

File tree

2 files changed

+5
-20
lines changed

2 files changed

+5
-20
lines changed

.github/workflows/conda-package.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ on:
99
env:
1010
PACKAGE_NAME: dpnp
1111
MODULE_NAME: dpnp
12-
VER_SCRIPT1: "import json; f = open('ver.json', 'r'); j = json.load(f); f.close(); "
13-
VER_SCRIPT2: "d = j['dpnp'][0]; print('='.join((d[s] for s in ('version', 'build'))))"
12+
CHANNELS: '-c dppy/label/dev -c intel -c defaults --override-channels'
1413

1514
jobs:
1615
build_linux:
@@ -66,7 +65,9 @@ jobs:
6665
run: conda install conda-build
6766

6867
- name: Build conda package
69-
run: ./scripts/build_conda_package.sh ${{ matrix.python }} $GITHUB_WORKSPACE/oneDPL
68+
run: conda build --no-test --python ${{ matrix.python }} ${{ env.CHANNELS }} conda-recipe
69+
env:
70+
DPLROOT: '${{ github.workspace }}/oneDPL'
7071

7172
- name: Upload artifact
7273
uses: actions/upload-artifact@v2
@@ -127,7 +128,7 @@ jobs:
127128
run: conda install conda-build
128129

129130
- name: Build conda package
130-
run: conda build --no-test --python ${{ matrix.python }} -c dppy/label/dev -c intel -c defaults --override-channels conda-recipe
131+
run: conda build --no-test --python ${{ matrix.python }} ${{ env.CHANNELS }} conda-recipe
131132
env:
132133
DPLROOT: '%GITHUB_WORKSPACE%\oneDPL'
133134

scripts/build_conda_package.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)