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

fix: address prefix auto generated when subnets passed #679

Merged
merged 3 commits into from
Dec 18, 2023
Merged

Conversation

vburckhardt
Copy link
Member

@vburckhardt vburckhardt commented Dec 1, 2023

Description

fixes #676

Release required?

  • No release
  • Patch release (x.x.X)
  • Minor release (x.X.x)
  • Major release (X.x.x)
Release notes content

Run the pipeline

If the CI pipeline doesn't run when you create the PR, the PR requires a user with GitHub collaborators access to run the pipeline.

Run the CI pipeline when the PR is ready for review and you expect tests to pass. Add a comment to the PR with the following text:

/run pipeline

Checklist for reviewers

  • If relevant, a test for the change is included or updated with this PR.
  • If relevant, documentation for the change is included or updated with this PR.

For mergers

  • Use a conventional commit message to set the release level. Follow the guidelines.
  • Include information that users need to know about the PR in the commit message. The commit message becomes part of the GitHub release notes.
  • Use the Squash and merge option.

@vburckhardt
Copy link
Member Author

/run pipeline

toddgiguere
toddgiguere previously approved these changes Dec 1, 2023
@ocofaigh
Copy link
Member

ocofaigh commented Dec 5, 2023

@vburckhardt As common-dev-assets was updated over the weekend renovate run, its now conflicting with your PR. If you locally rebase with main (git pull origin main) and run git submodule update --rebase to rebase the submodule, you should be good

@vburckhardt
Copy link
Member Author

@ocofaigh - need a quick re approval after pulling dev tools (I think we should change the logic here to not require one - to be discussed)

@ocofaigh
Copy link
Member

/run pipeline

@ocofaigh
Copy link
Member

@vburckhardt Approved - will merge once pipeline passes.
FYI its not that you needed to bump the common-dev-assets, its the fact that you included an update to common-dev-assets in the initial commit which then became out of date with the one in main branch since renovate updated it. The best way to void the conflict is to avoid committing any updates to common-dev-assets and allow renovate to update it

@ocofaigh ocofaigh merged commit e3640c6 into main Dec 18, 2023
@ocofaigh ocofaigh deleted the address-prefix branch December 18, 2023 11:11
@terraform-ibm-modules-ops
Copy link
Contributor

🎉 This PR is included in version 7.13.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Address prefixes auto generated when specifying only subnets
4 participants