Sync master into dependencies#11
Merged
Merged
Conversation
Move repeated values into environment variables and update git configuration. Add explicit permissions and simplify conditional logic in CI workflows.
* Bump docker/build-push-action from 5 to 7 (#3) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 7. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v5...v7) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... * Bump docker/setup-buildx-action from 3 to 4 (#4) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3 to 4. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](docker/setup-buildx-action@v3...v4) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... * Add README with template setup and workflow documentation (#5) * Bump docker/login-action from 3 to 4 (#1) Bumps [docker/login-action](https://github.com/docker/login-action) from 3 to 4. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@v3...v4) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... * Sync master into dependencies (#6) * Add README with template setup and workflow documentation * Refactor GitHub workflows for improved clarity Move repeated values into environment variables and update git configuration. Add explicit permissions and simplify conditional logic in CI workflows. * Bump docker/metadata-action from 5 to 6 (#2) Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 5 to 6. - [Release notes](https://github.com/docker/metadata-action/releases) - [Commits](docker/metadata-action@v5...v6) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... ---------
* Bump docker/build-push-action from 5 to 7 (#3) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 7. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v5...v7) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... * Bump docker/setup-buildx-action from 3 to 4 (#4) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3 to 4. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](docker/setup-buildx-action@v3...v4) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... * Add README with template setup and workflow documentation (#5) * Bump docker/login-action from 3 to 4 (#1) Bumps [docker/login-action](https://github.com/docker/login-action) from 3 to 4. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@v3...v4) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... * Sync master into dependencies (#6) * Add README with template setup and workflow documentation * Refactor GitHub workflows for improved clarity Move repeated values into environment variables and update git configuration. Add explicit permissions and simplify conditional logic in CI workflows. * Bump docker/metadata-action from 5 to 6 (#2) Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 5 to 6. - [Release notes](https://github.com/docker/metadata-action/releases) - [Commits](docker/metadata-action@v5...v6) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... * Sync master into dependencies (#8) * Add README with template setup and workflow documentation * Refactor GitHub workflows for improved clarity Move repeated values into environment variables and update git configuration. Add explicit permissions and simplify conditional logic in CI workflows. * Dependencies (#7) * Bump docker/build-push-action from 5 to 7 (#3) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 7. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v5...v7) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... * Bump docker/setup-buildx-action from 3 to 4 (#4) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3 to 4. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](docker/setup-buildx-action@v3...v4) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... * Add README with template setup and workflow documentation (#5) * Bump docker/login-action from 3 to 4 (#1) Bumps [docker/login-action](https://github.com/docker/login-action) from 3 to 4. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@v3...v4) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... * Sync master into dependencies (#6) * Add README with template setup and workflow documentation * Refactor GitHub workflows for improved clarity Move repeated values into environment variables and update git configuration. Add explicit permissions and simplify conditional logic in CI workflows. * Bump docker/metadata-action from 5 to 6 (#2) Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 5 to 6. - [Release notes](https://github.com/docker/metadata-action/releases) - [Commits](docker/metadata-action@v5...v6) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... ---------
The previous workflow tried fast-forward master into dependencies and fell back to a deps-sync branch + PR on failure. Under squash merges (used for both dependencies -> master and deps-sync -> dependencies), the branches diverge permanently after the first sync, so FF never succeeds and every push to master creates a fresh deps-sync PR. Open the PR with head=master directly and gate creation on a tree diff against dependencies. When trees already match (typical after a dependencies -> master merge) no PR is opened. This breaks the loop and drops the deps-sync branch from the design.
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.
Auto-generated by sync-dependencies.yml. Merge to bring master changes into dependencies.