Skip to content
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.

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

feat: merge the swagger files manually instead use nodetime swagger-combine (backport #4077) #4225

Merged
merged 6 commits into from
Jul 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 2, 2024

Description

This PR changes the package swagger-combine to merge all swagger files into the code instead of using the NodeJs pkg swagger-combine inside the nodetime binary.

How to test

  • Scaffold and run a chain:
ignite s chain venus && cd venus && \
ignite s list --yes user email && \
ignite c serve

…combine` (#4077)

* merge the Swagger files manually instead use nodejs swagger-combine

* add changelog

* remove unused function vars

* remove unused error handler

---------

Co-authored-by: Pantani <Pantani>
(cherry picked from commit 6de2f33)

# Conflicts:
#	go.mod
#	go.sum
#	ignite/pkg/cosmosgen/generate_openapi.go
#	ignite/pkg/nodetime/programs/swagger-combine/swagger-combine.go
@mergify mergify bot added the conflicts label Jul 2, 2024
@mergify mergify bot requested a review from ilgooz as a code owner July 2, 2024 11:53
Copy link
Contributor Author

mergify bot commented Jul 2, 2024

Cherry-pick of 6de2f33 has failed:

On branch mergify/bp/release/v28.x.y/pr-4077
Your branch is up to date with 'origin/release/v28.x.y'.

You are currently cherry-picking commit 6de2f338.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   changelog.md
	new file:   ignite/pkg/swagger-combine/swagger-combine.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   ignite/pkg/cosmosgen/generate_openapi.go
	deleted by them: ignite/pkg/nodetime/programs/swagger-combine/swagger-combine.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@Pantani Pantani marked this pull request as draft July 2, 2024 14:26
@Pantani Pantani closed this Jul 4, 2024
@Pantani Pantani deleted the mergify/bp/release/v28.x.y/pr-4077 branch July 4, 2024 12:07
@Pantani Pantani restored the mergify/bp/release/v28.x.y/pr-4077 branch July 10, 2024 00:50
@Pantani Pantani reopened this Jul 10, 2024
# Conflicts:
#	go.mod
#	go.sum
#	integration/doctor/testdata/missing-tools.go.txt
@github-actions github-actions bot added component:docs Documentation additions or improvements. type:services Service-related issues. labels Jul 10, 2024
@Pantani Pantani self-assigned this Jul 10, 2024
@Pantani Pantani marked this pull request as ready for review July 10, 2024 00:54
Copy link
Contributor

Visit the preview URL for this PR (updated for commit c8f5ab3):

https://igntservices-docs--pr4225-mergify-bp-release-v-t284sgfz.web.app

(expires Wed, 17 Jul 2024 00:55:39 GMT)

🔥 via Firebase Hosting GitHub Action 🌎

Sign: 95379efd94dd497aaa37c2d0354e6e2cafca5ec5

…/release/v28.x.y/pr-4077

# Conflicts:
#	ignite/pkg/cosmosgen/generate_openapi.go
#	ignite/templates/app/files/go.mod.plush
@github-actions github-actions bot removed the component:docs Documentation additions or improvements. label Jul 10, 2024
@github-actions github-actions bot removed component:templates type:services Service-related issues. labels Jul 10, 2024
@Pantani Pantani enabled auto-merge (squash) July 10, 2024 10:41
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK! It even fixes a bug in v28 💪🏾

@Pantani Pantani merged commit 96aed19 into release/v28.x.y Jul 10, 2024
44 checks passed
@Pantani Pantani deleted the mergify/bp/release/v28.x.y/pr-4077 branch July 10, 2024 18:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants