From 820259e662ac4f0f2e639f26737c5589fb8db1ea Mon Sep 17 00:00:00 2001
From: "elena.totmenina" <elena.totmenina@intel.com>
Date: Fri, 29 Oct 2021 14:21:11 +0300
Subject: [PATCH 1/2] change channels priority

---
 .github/workflows/conda-package.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
index 42b0fe367c..6f269afbeb 100644
--- a/.github/workflows/conda-package.yml
+++ b/.github/workflows/conda-package.yml
@@ -38,7 +38,7 @@ jobs:
         run: conda install conda-build
       - name: Build conda package
         run: |
-          CHANNELS="-c intel -c defaults --override-channels"
+          CHANNELS="-c defaults -c intel --override-channels"
           VERSIONS="--python ${{ matrix.python }}"
           TEST="--no-test"
           conda build \
@@ -83,7 +83,7 @@ jobs:
       - name: Install conda-build
         run: conda install conda-build
       - name: Build conda package
-        run: conda build --no-test --python ${{ matrix.python }} -c intel -c defaults --override-channels conda-recipe
+        run: conda build --no-test --python ${{ matrix.python }} -c defaults -c intel --override-channels conda-recipe
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:

From 2291f78f788039da23951a834b93180303718b45 Mon Sep 17 00:00:00 2001
From: "elena.totmenina" <elena.totmenina@intel.com>
Date: Mon, 1 Nov 2021 17:44:53 +0300
Subject: [PATCH 2/2] fix upload condition

---
 .github/workflows/conda-package.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
index 6f269afbeb..6b8ada1f31 100644
--- a/.github/workflows/conda-package.yml
+++ b/.github/workflows/conda-package.yml
@@ -215,7 +215,7 @@ jobs:
 
   upload_linux:
     needs: test_linux
-    if: ${{ github.ref }} == 'refs/heads/master' || ${{ github.ref }} == 'refs/heads/release*'
+    if: ${{github.ref == 'refs/heads/master' || (startsWith(github.ref, 'refs/heads/release') == true)}}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -240,7 +240,7 @@ jobs:
 
   upload_windows:
     needs: test_windows
-    if: ${{ github.ref }} == 'refs/heads/master' || ${{ github.ref }} == 'refs/heads/release*'
+    if: ${{github.ref == 'refs/heads/master' || (startsWith(github.ref, 'refs/heads/release') == true)}}
     runs-on: windows-latest
     strategy:
       matrix: