From e2c46022d957eaa1d9484e52276f9344361597b8 Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Fri, 9 Sep 2022 10:45:58 -0500 Subject: [PATCH 1/4] Reorder channels in conda-build --- .github/workflows/conda-package.yml | 5 ++--- scripts/build_conda_package.sh | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 50b573a3e364..69e2909c7091 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -9,8 +9,7 @@ on: env: PACKAGE_NAME: dpnp MODULE_NAME: dpnp - VER_SCRIPT1: "import json; f = open('ver.json', 'r'); j = json.load(f); f.close(); " - VER_SCRIPT2: "d = j['dpnp'][0]; print('='.join((d[s] for s in ('version', 'build'))))" + CHANNELS: '-c dppy/label/dev -c intel -c defaults --override-channels' jobs: build_linux: @@ -127,7 +126,7 @@ jobs: run: conda install conda-build - name: Build conda package - run: conda build --no-test --python ${{ matrix.python }} -c dppy/label/dev -c intel -c defaults --override-channels conda-recipe + run: conda build --no-test --python ${{ matrix.python }} ${{ env.CHANNELS }} conda-recipe env: DPLROOT: '%GITHUB_WORKSPACE%\oneDPL' diff --git a/scripts/build_conda_package.sh b/scripts/build_conda_package.sh index ae9474e1f773..514e8caf7498 100755 --- a/scripts/build_conda_package.sh +++ b/scripts/build_conda_package.sh @@ -5,7 +5,6 @@ DPLROOT=$2 export DPLROOT -CHANNELS="-c dppy/label/dev -c defaults -c intel --override-channels" VERSIONS="--python $PYTHON_VERSION" TEST="--no-test" From 124fe32045be62b38f36a6578f967cd942d536d4 Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Fri, 9 Sep 2022 11:04:43 -0500 Subject: [PATCH 2/4] Remove conda-build script for Linux --- .github/workflows/conda-package.yml | 4 +++- scripts/build_conda_package.sh | 15 --------------- 2 files changed, 3 insertions(+), 16 deletions(-) delete mode 100755 scripts/build_conda_package.sh diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 69e2909c7091..93cd30746887 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -65,7 +65,9 @@ jobs: run: conda install conda-build - name: Build conda package - run: ./scripts/build_conda_package.sh ${{ matrix.python }} $GITHUB_WORKSPACE/oneDPL + run: conda build --no-test --python ${{ matrix.python }} ${{ env.CHANNELS }} conda-recipe + env: + DPLROOT: '$GITHUB_WORKSPACE/oneDPL' - name: Upload artifact uses: actions/upload-artifact@v2 diff --git a/scripts/build_conda_package.sh b/scripts/build_conda_package.sh deleted file mode 100755 index 514e8caf7498..000000000000 --- a/scripts/build_conda_package.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -PYTHON_VERSION=$1 -DPLROOT=$2 - -export DPLROOT - -VERSIONS="--python $PYTHON_VERSION" -TEST="--no-test" - -conda build \ - $TEST \ - $VERSIONS \ - $CHANNELS \ - conda-recipe From 5a85a64eda02aaa1cdd4ce7b7e067cb7fda2e71b Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Fri, 9 Sep 2022 12:10:28 -0500 Subject: [PATCH 3/4] Use double quotes env var --- .github/workflows/conda-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 93cd30746887..ea3024b031b1 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -67,7 +67,7 @@ jobs: - name: Build conda package run: conda build --no-test --python ${{ matrix.python }} ${{ env.CHANNELS }} conda-recipe env: - DPLROOT: '$GITHUB_WORKSPACE/oneDPL' + DPLROOT: "$GITHUB_WORKSPACE/oneDPL" - name: Upload artifact uses: actions/upload-artifact@v2 From dcecd843b766f2df5422b7ac95983453081fb96f Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Fri, 9 Sep 2022 13:40:54 -0500 Subject: [PATCH 4/4] Use github.workspace variable to export DPLROOT in bash --- .github/workflows/conda-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index ea3024b031b1..756c5f8709da 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -67,7 +67,7 @@ jobs: - name: Build conda package run: conda build --no-test --python ${{ matrix.python }} ${{ env.CHANNELS }} conda-recipe env: - DPLROOT: "$GITHUB_WORKSPACE/oneDPL" + DPLROOT: '${{ github.workspace }}/oneDPL' - name: Upload artifact uses: actions/upload-artifact@v2