diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d29dfa6..4cfdcc2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -60,9 +60,9 @@ jobs: run: | /usr/bin/docker create --name test_ckan --network ${{ job.container.network }} --network-alias ckan \ -e "HOME=/github/home" -e GITHUB_ACTIONS=true -e CI=true -v "/var/run/docker.sock":"/var/run/docker.sock" \ - -v "/home/runner/work":"/__w" -v "/home/runner/runners/2.299.1/externals":"/__e":ro \ - -v "/home/runner/work/_temp":"/__w/_temp" -v "/home/runner/work/_actions":"/__w/_actions" \ - -v "/opt/hostedtoolcache":"/__t" -v "/home/runner/work/_temp/_github_home":"/github/home" \ + -v "/home/runner/work":"/__w" -v "/home/runner/work/_temp":"/__w/_temp" \ + -v "/home/runner/work/_actions":"/__w/_actions" -v "/opt/hostedtoolcache":"/__t" \ + -v "/home/runner/work/_temp/_github_home":"/github/home" \ -v "/home/runner/work/_temp/_github_workflow":"/github/workflow" \ --entrypoint "tail" openknowledge/ckan-dev:${{ matrix.ckan-version }} "-f" "/dev/null" docker start test_ckan diff --git a/bin/install_test_requirements.sh b/bin/install_test_requirements.sh index 1703bf0..601f3b9 100755 --- a/bin/install_test_requirements.sh +++ b/bin/install_test_requirements.sh @@ -7,18 +7,22 @@ pip install -e /__w/ckanext-stadtzh-harvest/ckanext-stadtzh-harvest/ pip install -U requests[security] # Install ckanext dependencies -pip install -e git+https://github.com/ckan/ckanext-dcat.git#egg=ckanext-dcat -pip install -e git+https://github.com/ckan/ckanext-harvest.git#egg=ckanext-harvest -pip install -r https://raw.githubusercontent.com/ckan/ckanext-harvest/master/requirements.txt pip install -e git+https://github.com/ckan/ckanext-xloader.git#egg=ckanext-xloader pip install -r https://raw.githubusercontent.com/ckan/ckanext-xloader/master/requirements.txt pip install -e git+https://github.com/opendatazurich/ckanext-stadtzh-theme.git@dockerizing#egg=ckanext-stadtzh-theme pip install -r https://raw.githubusercontent.com/opendatazurich/ckanext-stadtzh-theme/dockerizing/pip-requirements.txt if [ "$1" = "2.9-py2" ]; then - pip install -r https://raw.githubusercontent.com/ckan/ckanext-dcat/master/requirements-py2.txt + # Install most recent versions that still support Py2 + pip install -e git+https://github.com/ckan/ckanext-dcat.git@0c26bed5b7a3a7fca8e7b78e338aace096e0ebf6#egg=ckanext-dcat + pip install -r https://raw.githubusercontent.com/ckan/ckanext-dcat/0c26bed5b7a3a7fca8e7b78e338aace096e0ebf6/requirements-py2.txt + pip install -e git+https://github.com/ckan/ckanext-harvest.git@a628782a984a7ee9ac2c51236d3fad4b4e9c7fbb#egg=ckanext-harvest + pip install -r https://raw.githubusercontent.com/ckan/ckanext-harvest/a628782a984a7ee9ac2c51236d3fad4b4e9c7fbb/requirements.txt else + pip install -e git+https://github.com/ckan/ckanext-dcat.git#egg=ckanext-dcat pip install -r https://raw.githubusercontent.com/ckan/ckanext-dcat/master/requirements.txt + pip install -e git+https://github.com/ckan/ckanext-harvest.git#egg=ckanext-harvest + pip install -r https://raw.githubusercontent.com/ckan/ckanext-harvest/master/requirements.txt fi # Replace default path to CKAN core config file with the one on the container