From 0f96816f425fb6664c524aa1eef6a644d3b22d30 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Thu, 12 Dec 2024 16:12:13 -0500 Subject: [PATCH 1/4] BF: use datalad/packages method of installing git-annex "snapshot" method is installing into a temp folder and we would need to setup env var file to source etc. I have introduced that change in recent https://github.com/datalad/datalad/pull/7682 and missed that for that original commit appveyor did fail, and subsequent commit af2bd74 CI run had only OSX brew fail which made me think appveyor is ok, but apparently it was not there at all! So I missed that failure --- .appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 9de721c9ec..2653dc601d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -80,7 +80,7 @@ environment: INSTALL_SYSPKGS: python3-virtualenv CODECOV_BINARY: https://uploader.codecov.io/latest/linux/codecov # system git-annex is way too old, use better one - INSTALL_GITANNEX: git-annex -m snapshot + INSTALL_GITANNEX: git-annex -m datalad/packages # Windows core tests - ID: WinP39core # ~35 min @@ -98,7 +98,7 @@ environment: DTS: datalad.core datalad.dataset datalad.runner datalad.support APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey PY: 3.9 - # does not give a functional installation + # does not give a functional installation - needs env/PATH adjustment # INSTALL_GITANNEX: git-annex -m snapshot #INSTALL_GITANNEX: git-annex=8.20201129 INSTALL_GITANNEX: git-annex -m datalad/packages @@ -121,7 +121,7 @@ environment: INSTALL_SYSPKGS: python3-virtualenv CODECOV_BINARY: https://uploader.codecov.io/latest/linux/codecov # system git-annex is way too old, use better one - INSTALL_GITANNEX: git-annex -m snapshot + INSTALL_GITANNEX: git-annex -m datalad/packages - ID: WinP39a1 # ~40min DTS: > @@ -184,7 +184,7 @@ environment: INSTALL_SYSPKGS: python3-virtualenv CODECOV_BINARY: https://uploader.codecov.io/latest/linux/codecov # system git-annex is way too old, use better one - INSTALL_GITANNEX: git-annex -m snapshot + INSTALL_GITANNEX: git-annex -m datalad/packages - ID: Ubu22P311b # ~25min PY: 3.11 @@ -200,7 +200,7 @@ environment: INSTALL_SYSPKGS: python3-virtualenv CODECOV_BINARY: https://uploader.codecov.io/latest/linux/codecov # system git-annex is way too old, use better one - INSTALL_GITANNEX: git-annex -m snapshot + INSTALL_GITANNEX: git-annex -m datalad/packages matrix: allow_failures: From bc902a8dde705f37413562348bc7085f50ba331c Mon Sep 17 00:00:00 2001 From: DataLad Bot Date: Fri, 13 Dec 2024 15:45:05 +0000 Subject: [PATCH 2/4] [release-action] Autogenerate changelog snippet for PR 7692 --- changelog.d/pr-7692.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog.d/pr-7692.md diff --git a/changelog.d/pr-7692.md b/changelog.d/pr-7692.md new file mode 100644 index 0000000000..cc25a2ff7e --- /dev/null +++ b/changelog.d/pr-7692.md @@ -0,0 +1,3 @@ +### 🧪 Tests + +- BF: use datalad/packages method of installing git-annex. [PR #7692](https://github.com/datalad/datalad/pull/7692) (by [@yarikoptic](https://github.com/yarikoptic)) From fb669187734fbf60e377cfaa699e59da3db9615c Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 13 Dec 2024 12:35:50 -0500 Subject: [PATCH 3/4] appveyor mac: adjust PATH to point to package installed git-annex - not activated automagically Also use correct name for macos image was "broken" originally in 39eaebf3b8d5570690c6342b3f948bbab2d7eec4 but I guess did not have effect since we did not care to install anything via brew? --- .appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 2653dc601d..f0aaebac0d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -308,13 +308,14 @@ install: ) - sh: python -m pip install datalad-installer${DATALAD_INSTALLER_VERSION:-} # Missing system software - - sh: "[ -n \"$INSTALL_SYSPKGS\" ] && ( [ \"x${APPVEYOR_BUILD_WORKER_IMAGE}\" = \"xmacOS\" ] && brew install -q ${INSTALL_SYSPKGS} || { sudo apt-get update -y && sudo apt-get install --no-install-recommends -y ${INSTALL_SYSPKGS}; } ) || true" + - sh: "[ -n \"$INSTALL_SYSPKGS\" ] && ( [ \"x${APPVEYOR_BUILD_WORKER_IMAGE}\" = \"xmacos-monterey\" ] && brew install -q ${INSTALL_SYSPKGS} || { sudo apt-get update -y && sudo apt-get install --no-install-recommends -y ${INSTALL_SYSPKGS}; } ) || true" # Install git-annex on windows, otherwise INSTALL_SYSPKGS can be used # deploy git-annex, if desired - cmd: IF DEFINED INSTALL_GITANNEX datalad-installer --sudo ok %INSTALL_GITANNEX% - sh: "[ -n \"${INSTALL_GITANNEX}\" ] && datalad-installer --sudo ok ${INSTALL_GITANNEX}" # TODO remove when datalad-installer can handle this - cmd: tools\ci\appveyor_install_git-annex.bat + - sh: "[ \"x${APPVEYOR_BUILD_WORKER_IMAGE}\" = \"xmacos-monterey\" ] && export PATH=/Applications/git-annex.app/Contents/MacOS:$PATH || :" #before_build: From 6c5b628825acf8d4a8c97bafd0ca63cf8443419b Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Sat, 14 Dec 2024 11:10:53 -0500 Subject: [PATCH 4/4] Just symlink those git*s on MacOS export of PATH is insufficient while testing "remote" access to local environment since it would not make that PATH active. Instead of messing with env decided to do this evil step of symlinking. --- .appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index f0aaebac0d..2e4b3ea32f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -315,7 +315,9 @@ install: - sh: "[ -n \"${INSTALL_GITANNEX}\" ] && datalad-installer --sudo ok ${INSTALL_GITANNEX}" # TODO remove when datalad-installer can handle this - cmd: tools\ci\appveyor_install_git-annex.bat - - sh: "[ \"x${APPVEYOR_BUILD_WORKER_IMAGE}\" = \"xmacos-monterey\" ] && export PATH=/Applications/git-annex.app/Contents/MacOS:$PATH || :" + # "package" installation does not place git-annex into the PATH, and for + # compatibility etc, we just symlink also git itself + - sh: "[ \"x${APPVEYOR_BUILD_WORKER_IMAGE}\" = \"xmacos-monterey\" ] && ln -sf /Applications/git-annex.app/Contents/MacOS/git* /usr/local/bin/ || true" #before_build: