Skip to content

Fix checking out of other plugins branches/commits #209

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

Open
bethac07 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix checking out of other plugins branches/commits #209

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d61c6c
Don't exit if successful
bethac07 Jan 22, 2026
fb7b333
add sleep, reorg a bit
bethac07 Jan 22, 2026
c89a343
Double &
bethac07 Jan 22, 2026
0c8a4c1
One more
bethac07 Jan 22, 2026
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
19 changes: 4 additions & 15 deletions worker/run-worker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,34 +47,23 @@ python3.8 instance-monitor.py &
# 5. UPDATE AND/OR INSTALL PLUGINS
if [[ ${USE_PLUGINS} == 'True' ]]; then
if [[ ${UPDATE_PLUGINS} == 'True' ]]; then
echo "Updating CellProfiler-plugins."
cd CellProfiler-plugins
git fetch --all
git pull
cd ..
(echo "Updating CellProfiler-plugins." & cd CellProfiler-plugins && git fetch --all && git pull && cd ..)
fi
if [[ -z "$PLUGINS_COMMIT" ]]; then
PLUGINS_COMMIT='False'
fi
if [[ ${PLUGINS_COMMIT} != 'False' ]]; then
echo "Checking out specific CellProfiler-plugins commit."
cd CellProfiler-plugins
git checkout ${PLUGINS_COMMIT} || echo "No such commit, branch, or version; failing here." & exit 1
cd ..
(echo "Checking out specific CellProfiler-plugins commit." & cd CellProfiler-plugins && git checkout ${PLUGINS_COMMIT} && cd .. && echo "checkout successful" && sleep 3) || (echo "No such commit, branch, or version; failing here." & exit 1)
fi
if [[ ${INSTALL_REQUIREMENTS} == 'True' ]]; then
cd CellProfiler-plugins
if [[ -z "$REQUIREMENTS" ]]; then
REQUIREMENTS = $REQUIREMENTS_FILE
fi
if [[ -d "active_plugins" ]]; then
echo "Installing CellProfiler-plugins requirements."
pip install -e . ${REQUIREMENTS} || echo "Requirements install failed." & exit 1
cd ..
(echo "Installing CellProfiler-plugins requirements." & pip install -e . ${REQUIREMENTS} && cd ..) || (echo "Requirements install failed." & exit 1)
else
echo "Detected deprecated CellProfiler-plugins repo organization. Installing requirements."
pip install -r ${REQUIREMENTS} || echo "Requirements file not present or install failed; failing here." & exit 1
cd ..
(echo "Detected deprecated CellProfiler-plugins repo organization. Installing requirements." & pip install -r ${REQUIREMENTS} && cd ..) || (echo "Requirements file not present or install failed; failing here." & exit 1)
fi
fi
fi
Expand Down