Merge pull request #7020 from yarikoptic/rf-no-devel

Revert back to non-devel neurodebian in crippledfs/extensions, add testing against -next
datalad · Sep 8, 2022 · 9567368 · 9567368
2 parents e32e7e1 + e0e3159
commit 9567368
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/test_crippled.yml b/.github/workflows/test_crippled.yml
@@ -11,8 +11,8 @@ jobs:
       shell: bash
       run: |
         bash <(wget -q -O- http://neuro.debian.net/_files/neurodebian-travis.sh)
-        # enable repo for devel git-annex
-        sudo sed -e 's|\(deb.*data\)|#\1|' -e 's|/debian |/debian-devel |' /etc/apt/sources.list.d/neurodebian.sources.list | sudo tee /etc/apt/sources.list.d/neurodebian-devel.sources.list
+        # enable repo for devel git-annex if needed
+        # sudo sed -e 's|\(deb.*data\)|#\1|' -e 's|/debian |/debian-devel |' /etc/apt/sources.list.d/neurodebian.sources.list | sudo tee /etc/apt/sources.list.d/neurodebian-devel.sources.list
         sudo apt-get update -qq
         sudo apt-get install eatmydata
         sudo eatmydata apt-get install git-annex-standalone dosfstools

diff --git a/.github/workflows/test_extensions.yml b/.github/workflows/test_extensions.yml
@@ -16,14 +16,16 @@ jobs:
             datalad-metalad,
             datalad-crawler,
             datalad-deprecated,
+            datalad-next,
         ]
 
     steps:
     - name: Set up system
       shell: bash
       run: |
         bash <(wget -q -O- http://neuro.debian.net/_files/neurodebian-travis.sh)
-        sudo sed -i-devel.list -e 's,/debian ,/debian-devel ,g' /etc/apt/sources.list.d/neurodebian.sources.list
+        # enable in case -devel version is needed
+        # sudo sed -i-devel.list -e 's,/debian ,/debian-devel ,g' /etc/apt/sources.list.d/neurodebian.sources.list
         sudo apt-get update -qq
         sudo apt-get install eatmydata
         sudo eatmydata apt-get install git-annex-standalone
@@ -64,6 +66,8 @@ jobs:
             DL_TESTER=pytest;;
           datalad-container)
             DL_NEED_SINGULARITY=1;;
+          datalad-next)
+            DL_TESTER=pytest;;
         esac
         {
         echo "DL_PIP_INSTALLS=$DL_PIP_INSTALLS"
@@ -104,8 +108,8 @@ jobs:
         cd __testhome__
         # -crawler's tox.ini points to itself (but without full path) for coverage
         # configuration.  So far attempts to "fix" by somehow providing full path did not work.
-        # That is why just symlink it here.
-        ln -s ../__extension__/tox.ini .
+        # That is why just symlink it here.  If no tox.ini -- create an empty one
+        [ -e ../__extension__/tox.ini ] && ln -s ../__extension__/tox.ini . || touch tox.ini
         python -m pytest -c ./tox.ini -s -v --cov=datalad --pyargs ${DL_PACKAGE}
       if: env.DL_TESTER == 'pytest'