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

Bump cypress-io/github-action from 6.7.7 to 6.7.8 #5142

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jan 1, 2025

Bumps cypress-io/github-action from 6.7.7 to 6.7.8.

Release notes

Sourced from cypress-io/github-action's releases.

v6.7.8

6.7.8 (2024-12-09)

Bug Fixes

Commits
  • 57b7056 docs: update readme examples to ubuntu-24.04 (#1330)
  • 6436c09 fix(deps): update debug to 4.4.0 (#1329)
  • da3f0f5 ci: remove retiring ubuntu-20.04 from testing (#1324)
  • de32f6a chore(deps): update cypress to 13.16.1 (#1323)
  • 710a17d chore(deps): update dependency @​types/node to v22.10.1 (#1319)
  • d73d7d5 chore(deps): remove start-server-and-test from examples/config (#1321)
  • 01447ed test: use short-form cypress/browsers tag (#1318)
  • d14a1a1 test(deps): update wait-on-vite to vite v6 (#1317)
  • 52d8694 chore(deps): update dependency @​types/node to v22.9.4 (#1316)
  • 7320f3a chore(deps): update dependency husky to v9.1.7 (#1315)
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [cypress-io/github-action](https://github.com/cypress-io/github-action) from 6.7.7 to 6.7.8.
- [Release notes](https://github.com/cypress-io/github-action/releases)
- [Changelog](https://github.com/cypress-io/github-action/blob/master/CHANGELOG.md)
- [Commits](cypress-io/github-action@v6.7.7...v6.7.8)

---
updated-dependencies:
- dependency-name: cypress-io/github-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot added dependencies Pull requests that update a dependency file github_actions Pull requests that update Github_actions code labels Jan 1, 2025
@github-actions github-actions bot added this to the 3.10.0 milestone Jan 1, 2025
@Gustry Gustry merged commit dc81476 into master Jan 6, 2025
18 checks passed
@Gustry Gustry deleted the dependabot/github_actions/cypress-io/github-action-6.7.8 branch January 6, 2025 11:05
@3liz-bot
Copy link
Contributor

3liz-bot commented Jan 6, 2025

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply e811d2236... Bump cypress-io/github-action from 6.7.7 to 6.7.8
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging .github/workflows/e2e_tests.yml
CONFLICT (content): Merge conflict in .github/workflows/e2e_tests.yml

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_7 release_3_7
# Navigate to the new working tree
cd .worktrees/backport-release_3_7
# Create a new branch
git switch --create backport-5142-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick e811d22368dc5b04a79f512dc2d3b3ded4d358f9
# Push it to GitHub
git push --set-upstream origin backport-5142-to-release_3_7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_7

Then, create a pull request where the base branch is release_3_7 and the compare/head branch is backport-5142-to-release_3_7.

@3liz-bot
Copy link
Contributor

3liz-bot commented Jan 6, 2025

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply e811d2236... Bump cypress-io/github-action from 6.7.7 to 6.7.8
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging .github/workflows/e2e_tests.yml
CONFLICT (content): Merge conflict in .github/workflows/e2e_tests.yml

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_8 release_3_8
# Navigate to the new working tree
cd .worktrees/backport-release_3_8
# Create a new branch
git switch --create backport-5142-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick e811d22368dc5b04a79f512dc2d3b3ded4d358f9
# Push it to GitHub
git push --set-upstream origin backport-5142-to-release_3_8
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_8

Then, create a pull request where the base branch is release_3_8 and the compare/head branch is backport-5142-to-release_3_8.

@3liz-bot
Copy link
Contributor

3liz-bot commented Jan 6, 2025

The backport to release_3_9 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply e811d2236... Bump cypress-io/github-action from 6.7.7 to 6.7.8
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging .github/workflows/e2e_tests.yml
CONFLICT (content): Merge conflict in .github/workflows/e2e_tests.yml

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_9 release_3_9
# Navigate to the new working tree
cd .worktrees/backport-release_3_9
# Create a new branch
git switch --create backport-5142-to-release_3_9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick e811d22368dc5b04a79f512dc2d3b3ded4d358f9
# Push it to GitHub
git push --set-upstream origin backport-5142-to-release_3_9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_9

Then, create a pull request where the base branch is release_3_9 and the compare/head branch is backport-5142-to-release_3_9.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_7 backport release_3_8 backport release_3_9 dependencies Pull requests that update a dependency file failed backport github_actions Pull requests that update Github_actions code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants