Skip to content

Commit

Permalink
Re-enable Datalad SSH tests on macOS
Browse files Browse the repository at this point in the history
  • Loading branch information
jwodder committed Feb 11, 2021
1 parent 9061035 commit e08e5ce
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/build-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,20 @@ jobs:
hdiutil detach /Volumes/git-annex/
echo /Applications/git-annex.app/Contents/MacOS >> "$GITHUB_PATH"
- name: Set up SSH target
shell: bash
run: |
# coreutils provides a readlink that supports `-f`
brew install coreutils docker docker-machine
mkdir -p ~/.docker/machine/cache
wget -O ~/.docker/machine/cache/boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v19.03.12/boot2docker.iso
docker-machine create --driver virtualbox default
eval "$(docker-machine env default)"
export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
curl -fSsL \
https://raw.githubusercontent.com/datalad/datalad/master/tools/ci/prep-travis-forssh.sh \
| bash
echo DATALAD_TESTS_SSH=1 >> "$GITHUB_ENV"
- name: Set up environment
run: |
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@ jobs:
| bash
echo DATALAD_TESTS_SSH=1 >> "$GITHUB_ENV"
- name: Set up environment
run: |
git config --global user.email "[email protected]"
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/template/build-{{ostype}}.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -511,25 +511,24 @@ jobs:
{{step}}
{% endfor %}

{% if ostype == "ubuntu" %}
{# TODO: return for macos! https://github.com/datalad/git-annex/issues/42
{% if ostype == "ubuntu" or ostype == "macos" %} #}
{% if ostype == "ubuntu" or ostype == "macos" %}
- name: Set up SSH target
shell: bash
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
mkdir -p ~/.docker/machine/cache
wget -O ~/.docker/machine/cache/boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v19.03.12/boot2docker.iso
docker-machine 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" %}
{% elif ostype == "windows" %}
- name: Define test host alias
shell: cmd
run: |
Expand Down

0 comments on commit e08e5ce

Please sign in to comment.