Commit 7c2271d6 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Revert "Use a separate cache dir for every job, to avoid POCL cache races" 

This reverts commit 0b3d98ea.
parent 0b3d98ea

build-and-test-py-project-within-miniconda.sh

+0 −7
Original line number Diff line number Diff line 
#! /bin/bash



export XDG_CACHE_HOME="$HOME/.cache-$$"

rm -Rf $XDG_CACHE_HOME

mkdir -p $XDG_CACHE_HOME



echo "-----------------------------------------------"

echo "Current directory: $(pwd)"

echo "Conda environment file: ${CONDA_ENVIRONMENT}"

echo "Extra pip requirements: ${REQUIREMENTS_TXT}"

echo "PYOPENCL_TEST: ${PYOPENCL_TEST}"

echo "XDG_CACHE_HOME: ${XDG_CACHE_HOME}"

echo "-----------------------------------------------"



if [ "$(uname)" = "Darwin" ]; then
@@ -91,5 +86,3 @@ if [ -d test ]; then 
    # omit --junitxml=pytest.xml

  fi

fi
 


rm -Rf $XDG_CACHE_HOME

build-and-test-py-project.sh

+0 −7
Original line number Diff line number Diff line
@@ -4,15 +4,10 @@ if [ "$PY_EXE" == "" ]; then 
  PY_EXE=python${py_version}

fi



export XDG_CACHE_HOME="$HOME/.cache-$$"

rm -Rf $XDG_CACHE_HOME

mkdir -p $XDG_CACHE_HOME



echo "-----------------------------------------------"

echo "Current directory: $(pwd)"

echo "Python executable: ${PY_EXE}"

echo "PYOPENCL_TEST: ${PYOPENCL_TEST}"

echo "XDG_CACHE_HOME: ${XDG_CACHE_HOME}"

echo "-----------------------------------------------"



# {{{ clean up
@@ -139,5 +134,3 @@ if [ -d test ]; then 
    # omit --junitxml=pytest.xml

  fi

fi
 


rm -Rf $XDG_CACHE_HOME