State Upload #2903
Merged
State Upload #2903
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
# Conflicts: # cmd/state/internal/cmdtree/cmdtree.go # pkg/platform/api/svc/request/deprecation.go
Organize Fix query
Fix auth not provided Owner needs to be lowercase Description can't be non-empty Fix response parsing # Conflicts: # internal/gqlclient/gqlclient.go
Always prompt for confirmation # Conflicts: # cmd/state/internal/cmdtree/cmdtree.go # internal/runners/packages/search.go
…e name Update platform commit Rename --edit to --editor and rename author.go to upload.go Support setting meta through flags
# Conflicts: # internal/runners/packages/search.go
# Conflicts: # internal/captain/values.go # internal/captain/values_test.go # internal/runners/packages/install.go
# Conflicts: # internal/runbits/requirements/requirements.go # internal/runners/languages/install.go # internal/runners/packages/install.go # internal/runners/packages/uninstall.go # internal/runners/platforms/add.go # internal/runners/platforms/remove.go # pkg/platform/api/graphql/request/buildExpression.go # pkg/platform/api/graphql/request/pushCommit.go # pkg/platform/api/settings.go
# Conflicts: # internal/gqlclient/gqlclient.go # internal/locale/locales/en-us.yaml
…if there are no files
|
Honestly it was easier to do the merge and resolve the conflicts. It was pretty straightforward. I ran the integration tests locally on a PR deploy and it appears to work. We cannot run those tests on CI though since we cannot write to production right now and we don't have the ability to set a different API host on CI. As for the swagger changes, I'm inclined to leave them because I'm sure Nathan had a reason to make them. He also tested with those changes, and so did I. I'm not sure how you want to review this. It was already approved, and I just did a simple merge and fixed build failures from new stuff that's been added since then. |
MDrakos
approved these changes
Dec 14, 2023
as-builds
added a commit
that referenced
this pull request
Dec 14, 2023
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.
From #2552