[Monorepo] Add query service #2516
Merged
Conversation
This file contains 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
jparr721
requested review from
philippecamacho,
ImJeremyHe,
sveitser,
jbearer,
tbro and
imabdulbasit
as code owners
…into jp/add-query-service
…into jp/add-query-service
jparr721
commented
Feb 3, 2025
| @@ -13,7 +13,7 @@ on: | |||
| pull_request: | |||
| workflow_dispatch: | |||
|
|
|||
| concurrency: | |||
| @@ -6,6 +6,7 @@ extend-exclude = [ | |||
| "**/*.pdf", | |||
| "doc/*.svg", | |||
| "doc/*.puml", | |||
| "**/*.drawio", | |||
There was a problem hiding this comment.
Ignoring drawio files in query service
| @@ -70,7 +70,7 @@ marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketpla | |||
| marketplace-builder-shared = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "0.5.84" } | |||
| hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.58" } | |||
| hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.84" } | |||
| hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "v0.1.77" } | |||
| hotshot-query-service = { path = "hotshot-query-service" } | |||
tbro
approved these changes
Feb 3, 2025
jparr721
commented
Feb 3, 2025
| @@ -35,8 +35,8 @@ jobs: | |||
| # as each individual feature enabled. | |||
| - name: Check compilation for feature combinations | |||
| run: | | |||
| cargo hack check --feature-powerset | |||
| cargo hack check --feature-powerset --exclude hotshot-query-service | |||
There was a problem hiding this comment.
This is temporarily excluded because of the issue with dependencies in query service. We'll likely end up just merging these features into the parent sequencer module, but that'd require a high touch change. For now, we just remove it from the powerset because query service doesn't run correctly with certain subsets of features removed.
sveitser
added a commit
that referenced
this pull request
Feb 4, 2025
Note that the diff is zero so this does not change any code. Obtained as follows: 1. in query service repo ``` git checkout main git checkout -b ma/move-to-monorepo-2 git rm -r .github Cargo.lock git commit -a -m "monorepo: remove obsolete files" mv * hotshot-query-service mv .gitignore .github .envrc .cargo .config hotshot-query-service git commit -n -a -m "monorepo: move to subdirectory" ``` commit 01a9bb2 (query-service/ma/move-to-monorepo-2) monorepo: move to subdirectory commit b97bd0e monorepo: remove obsolete files 2. in this repo ``` git remote add query-service ../hotshot-query-service git fetch query-service git rm -r hotshot-query-service git commit -n -a -m "monorepo: remove query service without history" git merge query-service/ma/move-to-monorepo-2 --allow-unrelated-histories ``` commit a623fcd monorepo: remove query service without history Cherry pick commits (cherry picked all commits we made on #2516 but some are already applied, so ended up empty and don't show here). fd2c7eb * typos bd5bc89 * move dependency to path 302d7f1 * try to fix contract build 1b57bd9 * fix lint 41cfdf2 * fix one more 688d700 * fix test feature A fixup commit to ensure no diff to main be936f8 * ma/add-query-service-history origin/ma/add-query-service-history fixup to add query service history
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.
Monorepo project. First phase: Add the query service. This also includes CI fixes, etc.