sync: main to rhdp-deploy#613
Merged
Merged
Conversation
Bumps [ansible/ansible-lint](https://github.com/ansible/ansible-lint) from 26.4.0 to 26.6.0. - [Release notes](https://github.com/ansible/ansible-lint/releases) - [Commits](ansible/ansible-lint@5fac056...262624c) --- updated-dependencies: - dependency-name: ansible/ansible-lint dependency-version: 26.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…ons/ansible/ansible-lint-26.6.0 build(deps): bump ansible/ansible-lint from 26.4.0 to 26.6.0
Add a patternizer upgrade ci job
If the remote branch automated/patternizer-update already existed, the
old code did git checkout "$BRANCH" after the patternizer had already
modified files in the working tree. Git refused because uncommitted
changes would be overwritten
So it would fail like this:
```
Changes detected after patternizer update:
.claude/skills/pattern-author/SKILL.md
.claude/skills/pattern-author/reference.md
.cursor/skills/pattern-author/SKILL.md
.cursor/skills/pattern-author/reference.md
pattern.sh
From https://github.com/validatedpatterns/multicloud-gitops
* branch automated/patternizer-update -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by checkout:
.claude/skills/pattern-author/SKILL.md
.claude/skills/pattern-author/reference.md
.cursor/skills/pattern-author/SKILL.md
.cursor/skills/pattern-author/reference.md
Please commit your changes or stash them before you switch branches.
Aborting
```
Simplify git logic in patternizer-update
…update chore: automated patternizer update
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
1 participant
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.
sync-branches: New code has just landed in main, so let's bring rhdp-deploy up to speed!