From 45a01f7609af65030bdcd522d47f3eb6853f1bf4 Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Thu, 11 Feb 2021 16:35:35 -0500 Subject: [PATCH 1/7] Re-enable Datalad SSH tests on macOS --- .github/workflows/build-macos.yaml | 14 ++++++++++++++ .github/workflows/build-ubuntu.yaml | 1 - .../workflows/template/build-{{ostype}}.yaml.j2 | 11 +++++------ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml index 61c2ce5d74..64e5906ca6 100644 --- a/.github/workflows/build-macos.yaml +++ b/.github/workflows/build-macos.yaml @@ -380,6 +380,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: | diff --git a/.github/workflows/build-ubuntu.yaml b/.github/workflows/build-ubuntu.yaml index 70a6aa8cdf..ec6dfe8f00 100644 --- a/.github/workflows/build-ubuntu.yaml +++ b/.github/workflows/build-ubuntu.yaml @@ -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" diff --git a/.github/workflows/template/build-{{ostype}}.yaml.j2 b/.github/workflows/template/build-{{ostype}}.yaml.j2 index 35887b5a5d..90319c732c 100644 --- a/.github/workflows/template/build-{{ostype}}.yaml.j2 +++ b/.github/workflows/template/build-{{ostype}}.yaml.j2 @@ -598,16 +598,16 @@ 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 %} @@ -615,8 +615,7 @@ jobs: 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: | From f75634ea2119b61bd6383291e9a4ced941ca42c8 Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Tue, 16 Mar 2021 15:51:12 -0400 Subject: [PATCH 2/7] Try a potential fix --- .github/workflows/build-macos.yaml | 2 +- .github/workflows/template/build-{{ostype}}.yaml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml index 64e5906ca6..28590f2b22 100644 --- a/.github/workflows/build-macos.yaml +++ b/.github/workflows/build-macos.yaml @@ -387,7 +387,7 @@ jobs: 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 + docker-machine --native-ssh create --driver virtualbox default eval "$(docker-machine env default)" export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH" curl -fSsL \ diff --git a/.github/workflows/template/build-{{ostype}}.yaml.j2 b/.github/workflows/template/build-{{ostype}}.yaml.j2 index 90319c732c..374b947a5b 100644 --- a/.github/workflows/template/build-{{ostype}}.yaml.j2 +++ b/.github/workflows/template/build-{{ostype}}.yaml.j2 @@ -607,7 +607,7 @@ jobs: 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 + docker-machine --native-ssh create --driver virtualbox default eval "$(docker-machine env default)" export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH" {% endif %} From e5aacafc1cde02709cef5b1e0d25f76d235e7b5f Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 17 Mar 2021 08:44:18 -0400 Subject: [PATCH 3/7] Set TMPDIR="$HOME"/DLTMP --- .github/workflows/build-macos.yaml | 1 + .github/workflows/template/build-{{ostype}}.yaml.j2 | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml index 28590f2b22..6f81a14b01 100644 --- a/.github/workflows/build-macos.yaml +++ b/.github/workflows/build-macos.yaml @@ -398,6 +398,7 @@ jobs: - name: Set up environment run: | brew install exempi # Needed by python-xmp-toolkit + echo TMPDIR="$HOME"/DLTMP >> "$GITHUB_ENV" git config --global user.email "test@github.land" git config --global user.name "GitHub Almighty" diff --git a/.github/workflows/template/build-{{ostype}}.yaml.j2 b/.github/workflows/template/build-{{ostype}}.yaml.j2 index 374b947a5b..07ab6ff052 100644 --- a/.github/workflows/template/build-{{ostype}}.yaml.j2 +++ b/.github/workflows/template/build-{{ostype}}.yaml.j2 @@ -674,6 +674,7 @@ jobs: run: | {% if ostype == "macos" %} brew install exempi # Needed by python-xmp-toolkit + echo TMPDIR="$HOME"/DLTMP >> "$GITHUB_ENV" {% endif %} git config --global user.email "test@github.land" git config --global user.name "GitHub Almighty" From d4039b25722995cba56a9e8d963b0363024b94cb Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 17 Mar 2021 09:28:03 -0400 Subject: [PATCH 4/7] Create ~/DLTMP --- .github/workflows/build-macos.yaml | 1 + .github/workflows/template/build-{{ostype}}.yaml.j2 | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml index 6f81a14b01..2a40f94862 100644 --- a/.github/workflows/build-macos.yaml +++ b/.github/workflows/build-macos.yaml @@ -398,6 +398,7 @@ jobs: - name: Set up environment run: | brew install exempi # Needed by python-xmp-toolkit + mkdir -p ~/DLTMP echo TMPDIR="$HOME"/DLTMP >> "$GITHUB_ENV" git config --global user.email "test@github.land" git config --global user.name "GitHub Almighty" diff --git a/.github/workflows/template/build-{{ostype}}.yaml.j2 b/.github/workflows/template/build-{{ostype}}.yaml.j2 index 07ab6ff052..902e8df495 100644 --- a/.github/workflows/template/build-{{ostype}}.yaml.j2 +++ b/.github/workflows/template/build-{{ostype}}.yaml.j2 @@ -674,6 +674,7 @@ jobs: run: | {% if ostype == "macos" %} brew install exempi # Needed by python-xmp-toolkit + mkdir -p ~/DLTMP echo TMPDIR="$HOME"/DLTMP >> "$GITHUB_ENV" {% endif %} git config --global user.email "test@github.land" From d924de107f0fd5f26786f5348ba0d38664785a9f Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Thu, 18 Mar 2021 17:04:28 -0400 Subject: [PATCH 5/7] Set TMPDIR=/tmp/DLTMP --- .github/workflows/build-macos.yaml | 4 ++-- .github/workflows/template/build-{{ostype}}.yaml.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml index 2a40f94862..7113b13ca6 100644 --- a/.github/workflows/build-macos.yaml +++ b/.github/workflows/build-macos.yaml @@ -398,8 +398,8 @@ jobs: - name: Set up environment run: | brew install exempi # Needed by python-xmp-toolkit - mkdir -p ~/DLTMP - echo TMPDIR="$HOME"/DLTMP >> "$GITHUB_ENV" + mkdir -p /tmp/DLTMP + echo TMPDIR=/tmp/DLTMP >> "$GITHUB_ENV" git config --global user.email "test@github.land" git config --global user.name "GitHub Almighty" diff --git a/.github/workflows/template/build-{{ostype}}.yaml.j2 b/.github/workflows/template/build-{{ostype}}.yaml.j2 index 902e8df495..f5ec5d3f5c 100644 --- a/.github/workflows/template/build-{{ostype}}.yaml.j2 +++ b/.github/workflows/template/build-{{ostype}}.yaml.j2 @@ -674,8 +674,8 @@ jobs: run: | {% if ostype == "macos" %} brew install exempi # Needed by python-xmp-toolkit - mkdir -p ~/DLTMP - echo TMPDIR="$HOME"/DLTMP >> "$GITHUB_ENV" + mkdir -p /tmp/DLTMP + echo TMPDIR=/tmp/DLTMP >> "$GITHUB_ENV" {% endif %} git config --global user.email "test@github.land" git config --global user.name "GitHub Almighty" From 749c43de7561d434c8724ef4e31346f2590e6a9b Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Thu, 8 Apr 2021 09:36:44 -0400 Subject: [PATCH 6/7] Use resolved path for TMPDIR --- .github/workflows/build-macos.yaml | 4 ++-- .github/workflows/template/build-{{ostype}}.yaml.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml index 7113b13ca6..1f6963440c 100644 --- a/.github/workflows/build-macos.yaml +++ b/.github/workflows/build-macos.yaml @@ -398,8 +398,8 @@ jobs: - name: Set up environment run: | brew install exempi # Needed by python-xmp-toolkit - mkdir -p /tmp/DLTMP - echo TMPDIR=/tmp/DLTMP >> "$GITHUB_ENV" + 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" diff --git a/.github/workflows/template/build-{{ostype}}.yaml.j2 b/.github/workflows/template/build-{{ostype}}.yaml.j2 index f5ec5d3f5c..fb3bec24c2 100644 --- a/.github/workflows/template/build-{{ostype}}.yaml.j2 +++ b/.github/workflows/template/build-{{ostype}}.yaml.j2 @@ -674,8 +674,8 @@ jobs: run: | {% if ostype == "macos" %} brew install exempi # Needed by python-xmp-toolkit - mkdir -p /tmp/DLTMP - echo TMPDIR=/tmp/DLTMP >> "$GITHUB_ENV" + 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" From 328862386165f63ae0cf57cef86116493dfda9bd Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Tue, 5 Apr 2022 11:37:40 -0400 Subject: [PATCH 7/7] Try a fix for a vbox issue --- .github/workflows/build-macos.yaml | 7 +++++++ .github/workflows/build-ubuntu.yaml | 1 - .github/workflows/template/build-{{ostype}}.yaml.j2 | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml index 1f6963440c..6f25b75820 100644 --- a/.github/workflows/build-macos.yaml +++ b/.github/workflows/build-macos.yaml @@ -385,6 +385,13 @@ jobs: run: | # coreutils provides a readlink that supports `-f` brew install coreutils docker docker-machine + + # + brew uninstall virtualbox + cd "$(brew --repo homebrew/cask)" + git checkout 8670a72380c57c606d6582b645421e31dad2eee2 + brew install --cask virtualbox + 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 --native-ssh create --driver virtualbox default diff --git a/.github/workflows/build-ubuntu.yaml b/.github/workflows/build-ubuntu.yaml index ec6dfe8f00..b936c1df67 100644 --- a/.github/workflows/build-ubuntu.yaml +++ b/.github/workflows/build-ubuntu.yaml @@ -53,7 +53,6 @@ jobs: sudo apt-get update -qq sudo apt-get install eatmydata sudo eatmydata apt-get install singularity-container gnupg moreutils strace - echo "just a touch to trigger workflow" - name: Determine git-annex ref to build run: | diff --git a/.github/workflows/template/build-{{ostype}}.yaml.j2 b/.github/workflows/template/build-{{ostype}}.yaml.j2 index fb3bec24c2..701596418a 100644 --- a/.github/workflows/template/build-{{ostype}}.yaml.j2 +++ b/.github/workflows/template/build-{{ostype}}.yaml.j2 @@ -605,6 +605,13 @@ jobs: {% if ostype == "macos" %} # coreutils provides a readlink that supports `-f` brew install coreutils docker docker-machine + + # + brew uninstall virtualbox + cd "$(brew --repo homebrew/cask)" + git checkout 8670a72380c57c606d6582b645421e31dad2eee2 + brew install --cask virtualbox + 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 --native-ssh create --driver virtualbox default