use conda for intel ocl ci

inducer · Mar 9, 2022 · ea08a92 · ea08a92
1 parent 4a9dabb
commit ea08a92
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -52,17 +52,11 @@ jobs:
         -   uses: actions/checkout@v2
         -   name: "Main Script"
             run: |
-                curl -L -O https://raw.githubusercontent.com/illinois-scicomp/machine-shop-maintenance/main/install-intel-icd.sh
-                sudo bash ./install-intel-icd.sh
                 CONDA_ENVIRONMENT=.test-conda-env-py3.yml
-                echo "- ocl-icd-system" >> "$CONDA_ENVIRONMENT"
-                sed -i "/pocl/ d" "$CONDA_ENVIRONMENT"
+                sed -i "s/- pocl/- intel-opencl-rt/g" "$CONDA_ENVIRONMENT"
                 export PYOPENCL_TEST=intel
-                source /opt/enable-intel-cl.sh
-                curl -L -O https://tiker.net/ci-support-v0
-                . ./ci-support-v0
-                build_py_project_in_conda_env
-                test_py_project
+                curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh
+                . ./build-and-test-py-project-within-miniconda.sh
 
     pytest_no_arg_check:
         name: Conda Pytest without arg check