Fix the image build, and stop the fallback refusing Clusters - #109
Merged
Conversation
Two defects in the term_info fallback as merged.
The Docker build failed. It checked both clones out at "master", but the
two repositories disagree: VFB_json_schema_indexer's default branch is
`main` and VFB_json_schema's is `master`, so `git checkout master` in the
indexer failed with "pathspec 'master' did not match any file(s)". The refs
now default to the sentinel `default`, which skips the checkout and keeps
whatever the clone gave us; an explicit --build-arg still pins as before.
Naming a branch here would break again, silently, if either default were
renamed.
(The first failure on this hunk was different and is now moot:
VFB_json_schema_indexer was private, so the anonymous clone could not
authenticate. It is public as of today.)
EXCLUDED_ID_PREFIXES was applied to every id, but that list comes from the
*anatomical individual* indexer's parameter query. FBlc ids are Clusters,
which ClusterTermInfoQueryIndexer owns, so as written the fallback refused
to rebuild any Cluster document -- the one term type whose query exists
only in the indexer and not in QueryLibrary, and so the one this feature is
least able to do without. The list is renamed
ANATOMICAL_EXCLUDED_ID_PREFIXES and applied only on that branch.
Verified live: FBlc0006125 now rebuilds
("scRNAseq_2018_Davie_FULL_seq_clustering_adPN_neurons", types include
Cluster), and the clone/checkout chain was run through sh with both a
default and an explicit ref.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix the image build, and stop the fallback refusing Clusters
Two defects in #108 as merged.
main's Docker Image CI is currently red on the first of them.The build
The Dockerfile checked both clones out at
master, but the two repositories disagree —VFB_json_schema_indexer's default branch ismainandVFB_json_schema's ismaster— so the indexer checkout failed withpathspec 'master' did not match any file(s) known to git.The refs now default to the sentinel
default, which skips the checkout and keeps whatever the clone gave us. An explicit--build-arg INDEXER_REF=<sha>still pins exactly as before. Naming a branch here would break again, silently, the day either default is renamed.(The first failure on this hunk was a different one and is now moot:
VFB_json_schema_indexerwas a private repository, so the anonymous clone could not authenticate. It is public as of today.)Clusters
EXCLUDED_ID_PREFIXESwas applied to every id, but that list is copied from the anatomical individual indexer's parameter query:FBlcids are Clusters, whichClusterTermInfoQueryIndexerowns — so as written the fallback refused to rebuild any Cluster document. That is the one term type whose query exists only in the indexer and not inQueryLibrary, and therefore the one this feature can least afford to drop. RenamedANATOMICAL_EXCLUDED_ID_PREFIXESand applied only on that branch.How to test
Verified live. The clone/checkout chain was also run through
shwith both a default and an explicit ref. Unit tests still pass with and without the indexer checkout present.