From 26814f1acfb82dec41346dc535c3c7a876083245 Mon Sep 17 00:00:00 2001 From: Oleg Alexandrov Date: Fri, 2 Aug 2024 11:34:09 -0700 Subject: [PATCH] Tweak the doc for cloud workflows --- .github/workflows/build_test.sh | 13 +------------ .github/workflows/save_mac_deps.sh | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh index 2e1827073..70003d269 100755 --- a/.github/workflows/build_test.sh +++ b/.github/workflows/build_test.sh @@ -6,18 +6,7 @@ wget https://github.com/NeoGeographyToolkit/BinaryBuilder/releases/download/${ta /usr/bin/time tar xzf asp_deps.tar.gz -C / > /dev/null 2>&1 # this is verbose # The ASP dependencies at the location above are updated using the script -# save_mac_deps.sh. See that script for how to do the preparations. -# Here is how the script is called, from a local machine (which need not be a Mac). -# The tag set here must match the tag above, and also in build_isis.sh. -# If changing here, must later change in the other places. -# tag=mac_conda_env8 -# workflow="ssh.yml" # manual workflow -# #workflow="build_isis.yml" # automatic workflow -# $HOME/projects/StereoPipeline/.github/workflows/save_mac_deps.sh $workflow $tag - -# For linux, the dependencies from the local machine can be saved as follows. -# tag=linux_conda_env7 -# $HOME/projects/StereoPipeline/.github/workflows/save_linux_deps.sh $tag +# save_mac_deps.sh. See that script for more info. # Check that base dir is StereoPipeline aspRepoDir=$(pwd) # same as $HOME/work/StereoPipeline/StereoPipeline diff --git a/.github/workflows/save_mac_deps.sh b/.github/workflows/save_mac_deps.sh index 97e656a84..468b76883 100755 --- a/.github/workflows/save_mac_deps.sh +++ b/.github/workflows/save_mac_deps.sh @@ -1,8 +1,8 @@ #!/bin/bash # To update the Mac dependencies, or create new ones, run the ssh.yml action -# (for interactive use) or build_isis.yml (batch). The dependencies can be -# built, fetched with conda, etc. They should be installed in +# (for interactive use) or build_isis.yml (batch). Some dependencies can be +# fetched with conda, and others need to be built. They should be installed in # /Users/runner/miniconda3/envs. # See https://stereopipeline.readthedocs.io/en/latest/building_asp.html # for more details. @@ -12,10 +12,22 @@ # /usr/bin/time tar cfz ~/work/StereoPipeline/packages/asp_deps.tar.gz \ # /Users/runner/miniconda3/envs -# Then, from a local machine, run this script. See build_test.sh for -# context and an example. +# Then, from a local machine, which need not be a mac, run this script. -# Must keep $tag in sync. +# The tag set here must match the tag in build_test.sh and build_isis.sh. If +# changing here, must later change in the other places. + +# tag=mac_conda_env8 +# workflow="ssh.yml" # manual workflow +# #workflow="build_isis.yml" # automatic workflow +# $HOME/projects/StereoPipeline/.github/workflows/save_mac_deps.sh $workflow $tag + +# This script will overwrite the dependencies. If in doubt, use it with a new +# tag, as the dependencies are very hard to recreate. + +# For linux, the dependencies from the local machine can be saved as follows. +# tag=linux_conda_env7 +# $HOME/projects/StereoPipeline/.github/workflows/save_linux_deps.sh $tag # Check usage if [ "$#" -lt 2 ]; then