From 304c52731066003116ade89148a0f710ce33dac9 Mon Sep 17 00:00:00 2001
From: Yevhenii Havrylko <yevhenii.havrylko@intel.com>
Date: Thu, 13 Jul 2023 17:06:58 -0400
Subject: [PATCH] Update coverage

---
 .github/actions/setup-numba-dpex/action.yml | 24 ++++++++++-------
 .github/workflows/coverage.yml              |  4 +++
 environment/coverage.yml                    | 29 +++++++++------------
 3 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/.github/actions/setup-numba-dpex/action.yml b/.github/actions/setup-numba-dpex/action.yml
index 6db253c703..3ea5238637 100644
--- a/.github/actions/setup-numba-dpex/action.yml
+++ b/.github/actions/setup-numba-dpex/action.yml
@@ -1,31 +1,35 @@
 name: Setup numba-dpex
 description: 'Setup conda environment, build numba-dpex and setup devices'
 inputs:
+  # environment-file:
   environment:
     description: Environment file
     required: true
     default: environment/dev.yml
+  environment-name:
+    description: Environment name
+    default: work-env
 runs:
   using: "composite"
   steps:
-    - name: Setup conda
-      run: echo $CONDA/bin >> $GITHUB_PATH
-      shell: bash
-
-    - name: Setup conda environment
-      run: conda env update -n base -f ${{ inputs.environment }} --prune
-      shell: bash
+    - uses: conda-incubator/setup-miniconda@v2
+      with:
+        python-version: 3.9
+        mamba-version: "*"
+        activate-environment: "${{ inputs.environment-name }}"
+        channel-priority: "disabled"
+        environment-file: "${{ inputs.environment }}"
 
     - name: Test conda environment
+      shell: bash -l {0}
       run: conda list
-      shell: bash
 
     - name: Build numba-dpex
+      shell: bash -l {0}
       run: |
         export PATH=$CONDA/bin-llvm:$PATH
         python setup.py develop
-      shell: bash
 
     - name: Setup OpenCL CPU device
+      shell: bash -l {0}
       run: echo "OCL_ICD_FILENAMES=libintelocl.so" >> $GITHUB_ENV
-      shell: bash
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index ee1fbb0dd6..39715a1a13 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -12,6 +12,9 @@ jobs:
   main:
     name: Generate coverage and push to Coveralls.io
     runs-on: ubuntu-20.04
+    defaults:
+      run:
+        shell: bash -l {0}
 
     steps:
       - name: Cancel Previous Runs
@@ -28,6 +31,7 @@ jobs:
         uses: ./.github/actions/setup-numba-dpex
         with:
           environment: environment/coverage.yml
+          environment-name: "dpex-coverage"
 
       - name: Test installation
         run: |
diff --git a/environment/coverage.yml b/environment/coverage.yml
index d214b07a77..a777c874db 100644
--- a/environment/coverage.yml
+++ b/environment/coverage.yml
@@ -4,29 +4,26 @@ channels:
   - numba
   - intel
   - numba/label/dev
-  - pkgs/main
+  - conda-forge
   - nodefaults
 dependencies:
-  - python=3.9
-  - defaults:libffi
+  - libffi
   - gxx_linux-64
   - dpcpp_linux-64
-  - numba 0.57*
+  - numba
   - dppy/label/dev:dpctl
   - dppy/label/dev:dpnp
   - spirv-tools
   - dpcpp-llvm-spirv
   - packaging
   - pytest
-  - pip
-  - pip:
-    - coverage
-    - pre-commit
-    - flake8
-    - black==20.8b1
-    - pytest-cov
-    - pytest-xdist
-    - pexpect
-variables:
-  CHANNELS: -c defaults -c numba -c intel -c numba/label/dev -c dppy/label/dev --override-channels
-  CHANNELS_DEV: -c dppy/label/dev -c defaults -c numba -c intel -c numba/label/dev --override-channels
+  - coverage
+  - pre-commit
+  - flake8
+  - black==20.8b1
+  - pytest-cov
+  - pytest-xdist
+  - pexpect
+# variables:
+#   CHANNELS: -c nodefaults -c conda-forge -c numba -c intel -c numba/label/dev -c dppy/label/dev --override-channels
+#   CHANNELS_DEV: -c dppy/label/dev -c nodefaults -c conda-forge -c numba -c intel -c numba/label/dev --override-channels