Skip to content

Commit

Permalink
relase.sh: try to fix invocation of ansible-galaxy
Browse files Browse the repository at this point in the history
  • Loading branch information
egraff committed Mar 13, 2021
1 parent e0a3cd7 commit 561010d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ install:
- '%MSYS2_BASH% --login -c "pacman -S --noconfirm --needed git openssl rsync p7zip"'
- '%MSYS2_BASH% --login -c "pacman -S --noconfirm --needed p7zip"'

- '%MSYS2_BASH% --login -c "cd $APPVEYOR_BUILD_FOLDER && curl -fsSLOJ https://github.com/egraff/winsible/releases/download/v0.1.1/winsible.7z"'
- '%MSYS2_BASH% --login -c "cd $APPVEYOR_BUILD_FOLDER && curl -fsSLOJ https://github.com/egraff/winsible/releases/download/v0.1.2/winsible.7z"'
- '%MSYS2_BASH% --login -c "curl -fsSLOJ https://github.com/chrislake/7zsfxmm/releases/download/1.7.0.3900/7zsd_extra_170_3900.7z"'
- '%MSYS2_BASH% --login -c "TARGET_DIR=`cd $APPVEYOR_BUILD_FOLDER && pwd` && mkdir $TARGET_DIR/7zsd_extra && 7z e 7zsd_extra_170_3900.7z -o$TARGET_DIR/7zsd_extra"'

Expand Down
4 changes: 3 additions & 1 deletion release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ rsync --archive -v "$SHARE"/ansible/ ansible/

echo "Installing ansible collections"

env -i msys64/usr/bin/sh.exe -c 'cd ansible && PATH="/usr/local/bin:/usr/bin:/bin:/opt/bin" ansible-galaxy collection install -f -r roles/requirements'
# Note: I haven't figured out how to enter the other MSYS environment from the first, without "inheriting" state
# that determines where the MSYS FS is rooted, so use cmd.exe as a wrapper to avoid this problem for now...
cmd /c 'msys64\usr\bin\sh.exe -c "cd ansible && export PATH=\"/usr/local/bin:/usr/bin:/bin:/opt/bin\" && ansible-galaxy collection install -f -r roles/requirements.yml"'

echo "Creating archive"

Expand Down

0 comments on commit 561010d

Please sign in to comment.