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

Update dependencies and CI/CD #572

Merged
merged 1 commit into from
Jun 14, 2024
Merged

Update dependencies and CI/CD #572

merged 1 commit into from
Jun 14, 2024

Conversation

Spomky
Copy link
Member

@Spomky Spomky commented Jun 1, 2024

Target branch: 4.0.x
Resolves issue #

  • It is a Bug fix
  • It is a New feature
  • It is related to dependencies

Includes:

  • Breaks BC
  • Deprecations

@Spomky Spomky added the CI-CD label Jun 1, 2024
@Spomky Spomky self-assigned this Jun 1, 2024
@Spomky Spomky added this to the 4.0.0 milestone Jun 1, 2024
@Spomky Spomky added bug Dependencies Pull requests that update a dependency file labels Jun 1, 2024
Copy link
Member Author

Spomky commented Jun 14, 2024

@Mergifyio rebase

Copy link

mergify bot commented Jun 14, 2024

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging composer.json
CONFLICT (content): Merge conflict in composer.json
error: could not apply 7d5842b... Update HTTP request methods and test values naming
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 7d5842b... Update HTTP request methods and test values naming

Copy link
Member Author

Spomky commented Jun 14, 2024

@Mergifyio squash title+body

Copy link

mergify bot commented Jun 14, 2024

squash title+body

✅ Pull request squashed successfully

Spomky added a commit that referenced this pull request Jun 14, 2024
Target branch: 4.0.x
Resolves issue #

- [ ] It is a Bug fix
- [ ] It is a New feature
- [ ] It is related to dependencies

Includes:
- [ ] Breaks BC
- [ ] Deprecations
Copy link
Member Author

Spomky commented Jun 14, 2024

@Mergifyio squash title+body

Target branch: 4.0.x
Resolves issue #

- [ ] It is a Bug fix
- [ ] It is a New feature
- [ ] It is related to dependencies

Includes:
- [ ] Breaks BC
- [ ] Deprecations
Copy link

mergify bot commented Jun 14, 2024

squash title+body

✅ Pull request squashed successfully

@Spomky Spomky changed the title Improve error handling and update dependencies Update dependencies and CI/CD Jun 14, 2024
@Spomky Spomky merged commit 3c9b0aa into 4.0.x Jun 14, 2024
12 checks passed
@Spomky Spomky deleted the deps/upgrade branch June 14, 2024 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge bug CI-CD Dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant