Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use docker-practice/actions-setup-docker to set up Docker on macOS #58

Closed
wants to merge 8 commits into from
Closed

Use docker-practice/actions-setup-docker to set up Docker on macOS #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
21c40e4
Re-enable Datalad SSH tests on macOS
jwodder Feb 11, 2021
cd9d0f4
Try a potential fix
jwodder Mar 16, 2021
b79f504
See if this action works better
jwodder Mar 16, 2021
def3dd1
Set TMPDIR="$HOME"/DLTMP
jwodder Mar 17, 2021
bb53ead
Create ~/DLTMP
jwodder Mar 17, 2021
00f2d29
Set TMPDIR=/tmp/DLTMP
jwodder Mar 18, 2021
b52f04e
Update the actual workflow
jwodder Mar 24, 2021
2925e14
Use resolved path for TMPDIR
jwodder Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .github/workflows/build-macos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,10 +380,25 @@ jobs:
hdiutil detach /Volumes/git-annex/
echo /Applications/git-annex.app/Contents/MacOS >> "$GITHUB_PATH"

- name: Set up Docker
uses: docker-practice/actions-setup-docker@v1

- name: Set up SSH target
shell: bash
run: |
# coreutils provides a readlink that supports `-f`
brew install coreutils
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: |
brew install exempi # Needed by python-xmp-toolkit
mkdir -p /private/tmp/DLTMP
echo TMPDIR=/private/tmp/DLTMP >> "$GITHUB_ENV"
git config --global user.email "test@github.land"
git config --global user.name "GitHub Almighty"

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-ubuntu.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,6 @@ jobs:
| bash
echo DATALAD_TESTS_SSH=1 >> "$GITHUB_ENV"


- name: Set up environment
run: |
git config --global user.email "test@github.land"
Expand Down
18 changes: 10 additions & 8 deletions .github/workflows/template/build-{{ostype}}.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,25 +598,25 @@ 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" %}
{% if ostype == "macos" %}
- name: Set up Docker
uses: docker-practice/actions-setup-docker@v1

{% endif %}
- 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
eval "$(docker-machine env default)"
brew install coreutils
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 Expand Up @@ -675,6 +675,8 @@ jobs:
run: |
{% if ostype == "macos" %}
brew install exempi # Needed by python-xmp-toolkit
mkdir -p /private/tmp/DLTMP
echo TMPDIR=/private/tmp/DLTMP >> "$GITHUB_ENV"
{% endif %}
git config --global user.email "test@github.land"
git config --global user.name "GitHub Almighty"
Expand Down