Skip to content

Commit e08e5ce

Browse files
committed
Re-enable Datalad SSH tests on macOS
1 parent 9061035 commit e08e5ce

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

.github/workflows/build-macos.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,20 @@ jobs:
340340
hdiutil detach /Volumes/git-annex/
341341
echo /Applications/git-annex.app/Contents/MacOS >> "$GITHUB_PATH"
342342
343+
- name: Set up SSH target
344+
shell: bash
345+
run: |
346+
# coreutils provides a readlink that supports `-f`
347+
brew install coreutils docker docker-machine
348+
mkdir -p ~/.docker/machine/cache
349+
wget -O ~/.docker/machine/cache/boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v19.03.12/boot2docker.iso
350+
docker-machine create --driver virtualbox default
351+
eval "$(docker-machine env default)"
352+
export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
353+
curl -fSsL \
354+
https://raw.githubusercontent.com/datalad/datalad/master/tools/ci/prep-travis-forssh.sh \
355+
| bash
356+
echo DATALAD_TESTS_SSH=1 >> "$GITHUB_ENV"
343357
344358
- name: Set up environment
345359
run: |

.github/workflows/build-ubuntu.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,6 @@ jobs:
349349
| bash
350350
echo DATALAD_TESTS_SSH=1 >> "$GITHUB_ENV"
351351
352-
353352
- name: Set up environment
354353
run: |
355354
git config --global user.email "[email protected]"

.github/workflows/template/build-{{ostype}}.yaml.j2

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -511,25 +511,24 @@ jobs:
511511
{{step}}
512512
{% endfor %}
513513

514-
{% if ostype == "ubuntu" %}
515-
{# TODO: return for macos! https://github.com/datalad/git-annex/issues/42
516-
{% if ostype == "ubuntu" or ostype == "macos" %} #}
514+
{% if ostype == "ubuntu" or ostype == "macos" %}
517515
- name: Set up SSH target
518516
shell: bash
519517
run: |
520518
{% if ostype == "macos" %}
521519
# coreutils provides a readlink that supports `-f`
522520
brew install coreutils docker docker-machine
523-
docker-machine --github-api-token="${{ secrets.GITHUB_TOKEN }}" create --driver virtualbox default
521+
mkdir -p ~/.docker/machine/cache
522+
wget -O ~/.docker/machine/cache/boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v19.03.12/boot2docker.iso
523+
docker-machine create --driver virtualbox default
524524
eval "$(docker-machine env default)"
525525
export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
526526
{% endif %}
527527
curl -fSsL \
528528
https://raw.githubusercontent.com/datalad/datalad/master/tools/ci/prep-travis-forssh.sh \
529529
| bash
530530
echo DATALAD_TESTS_SSH=1 >> "$GITHUB_ENV"
531-
532-
{% elif ostype == "windows" %}
531+
{% elif ostype == "windows" %}
533532
- name: Define test host alias
534533
shell: cmd
535534
run: |

0 commit comments

Comments
 (0)