Skip to content

chore: merge main into feat/py312 #9302

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

Merged
jennifer-richards merged 1 commit into from
Aug 5, 2025
Merged

chore: merge main into feat/py312 #9302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion docker/scripts/app-init-celery.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,14 @@ fi

USER_BIN_PATH="/home/dev/.local/bin"
WATCHMEDO="$USER_BIN_PATH/watchmedo"
CELERY="$USER_BIN_PATH/celery"
# Find a celery that works
if [[ -x "$USER_BIN_PATH/celery" ]]; then
# This branch is used for dev
CELERY="$USER_BIN_PATH/celery"
else
# This branch is used for sandbox instances
CELERY="/usr/local/bin/celery"
fi
trap 'trap "" TERM; cleanup' TERM
# start celery in the background so we can trap the TERM signal
if [[ -n "${DEV_MODE}" && -x "${WATCHMEDO}" ]]; then
Expand Down
Loading