Skip to content

Commit

Permalink
RF: Disable SSH testing on OSX, enable on linux everywhere
Browse files Browse the repository at this point in the history
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 #42
  • Loading branch information
yarikoptic committed Feb 1, 2021
1 parent e99b355 commit 5932bdd
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/template/build-{{ostype}}.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down

0 comments on commit 5932bdd

Please sign in to comment.