Skip to content
Snippets Groups Projects
Unverified Commit c0854ce6 authored by David Robertson's avatar David Robertson Committed by GitHub
Browse files

Hack to rebuild the complement editable image (#15184)

* Hack to rebuild the complement editable image

* Changelog
parent 869ef75c
Branches
Tags
No related merge requests found
Add an option to force a rebuild of the "editable" complement image.
...@@ -59,6 +59,11 @@ Run the complement test suite on Synapse. ...@@ -59,6 +59,11 @@ Run the complement test suite on Synapse.
is important. is important.
Not suitable for use in CI in case the editable environment is impure. Not suitable for use in CI in case the editable environment is impure.
--rebuild-editable
Force a rebuild of the editable build of Synapse.
This is occasionally useful if the built-in rebuild detection with
--editable fails, e.g. when changing configure_workers_and_start.py.
For help on arguments to 'go test', run 'go help testflag'. For help on arguments to 'go test', run 'go help testflag'.
EOF EOF
} }
...@@ -82,6 +87,9 @@ while [ $# -ge 1 ]; do ...@@ -82,6 +87,9 @@ while [ $# -ge 1 ]; do
"-e"|"--editable") "-e"|"--editable")
use_editable_synapse=1 use_editable_synapse=1
;; ;;
"--rebuild-editable")
rebuild_editable_synapse=1
;;
*) *)
# unknown arg: presumably an argument to gotest. break the loop. # unknown arg: presumably an argument to gotest. break the loop.
break break
...@@ -116,7 +124,9 @@ if [ -n "$use_editable_synapse" ]; then ...@@ -116,7 +124,9 @@ if [ -n "$use_editable_synapse" ]; then
fi fi
editable_mount="$(realpath .):/editable-src:z" editable_mount="$(realpath .):/editable-src:z"
if docker inspect complement-synapse-editable &>/dev/null; then if [ -n "$rebuild_editable_synapse" ]; then
unset skip_docker_build
elif docker inspect complement-synapse-editable &>/dev/null; then
# complement-synapse-editable already exists: see if we can still use it: # complement-synapse-editable already exists: see if we can still use it:
# - The Rust module must still be importable; it will fail to import if the Rust source has changed. # - The Rust module must still be importable; it will fail to import if the Rust source has changed.
# - The Poetry lock file must be the same (otherwise we assume dependencies have changed) # - The Poetry lock file must be the same (otherwise we assume dependencies have changed)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment