From 5932bdd5a1b0030e77a31a7016751d2c8697d7bc Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Mon, 1 Feb 2021 10:24:34 -0500
Subject: [PATCH] RF: Disable SSH testing on OSX, enable on linux everywhere

For not yet known reason we have a problem instantiating a proper docker
container on OSX for ssh testing.  Also I found some logic which we
should have removed after datalad 0.13.2 release while establishing
that docker container on osx and linux -- so I removed conditional

Re OSX: see https://github.com/datalad/git-annex/issues/42
---
 .../template/build-{{ostype}}.yaml.j2         | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/template/build-{{ostype}}.yaml.j2 b/.github/workflows/template/build-{{ostype}}.yaml.j2
index 126ffdc19e..f44a011ce2 100644
--- a/.github/workflows/template/build-{{ostype}}.yaml.j2
+++ b/.github/workflows/template/build-{{ostype}}.yaml.j2
@@ -510,25 +510,25 @@ jobs:
           {{step}}
           {% endfor %}
 
-    {% if ostype == "ubuntu" or ostype == "macos" %}
+    {% if ostype == "ubuntu" %}
+    {# TODO: return for macos! https://github.com/datalad/git-annex/issues/42
+      {% if ostype == "ubuntu"  or ostype == "macos" %} #}
       - name: Set up SSH target
         shell: bash
-        # TODO: Drop the release condition once 0.13.2 is released.
-        run: |
-          if [ "${{ matrix.version }}" != "release" ]; then
-            {% if ostype == "macos" %}
-            # coreutils provides a readlink that supports `-f`
-            brew install coreutils docker docker-machine
-            docker-machine --github-api-token="${{ secrets.GITHUB_TOKEN }}" create --driver virtualbox default
-            eval "$(docker-machine env default)"
-            export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
-            {% endif %}
-            curl -fSsL \
-              https://raw.githubusercontent.com/datalad/datalad/master/tools/ci/prep-travis-forssh.sh \
-              | bash
-            echo DATALAD_TESTS_SSH=1 >> "$GITHUB_ENV"
-          fi
-    {% elif ostype == "windows" %}
+        run: |
+          {% if ostype == "macos" %}
+          # coreutils provides a readlink that supports `-f`
+          brew install coreutils docker docker-machine
+          docker-machine --github-api-token="${{ secrets.GITHUB_TOKEN }}" create --driver virtualbox default
+          eval "$(docker-machine env default)"
+          export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
+          {% endif %}
+          curl -fSsL \
+            https://raw.githubusercontent.com/datalad/datalad/master/tools/ci/prep-travis-forssh.sh \
+            | bash
+          echo DATALAD_TESTS_SSH=1 >> "$GITHUB_ENV"
+
+   {% elif ostype == "windows" %}
       - name: Define test host alias
         shell: cmd
         run: |