3liz / lizmap-web-client

Transfer a QGIS project on a server, Lizmap is providing the web interface to browse it
https://www.lizmap.com
Mozilla Public License 2.0
257 stars 143 forks source link

Bump cypress-io/github-action from 6.7.5 to 6.7.6 #4827

Closed dependabot[bot] closed 10 hours ago

dependabot[bot] commented 1 day ago

Bumps cypress-io/github-action from 6.7.5 to 6.7.6.

Release notes

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

v6.7.6

6.7.6 (2024-09-07)

Bug Fixes

Commits


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 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)
3liz-bot commented 10 hours ago

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` error: could not apply e90688b1d... Bump cypress-io/github-action from 6.7.5 to 6.7.6 hint: After resolving the conflicts, mark them with hint: "git add/rm ", 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-4827-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick e90688b1db5e44d1cfdf986fc501e38da8556f15
# Push it to GitHub
git push --set-upstream origin backport-4827-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-4827-to-release_3_7.

3liz-bot commented 10 hours ago

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` error: could not apply e90688b1d... Bump cypress-io/github-action from 6.7.5 to 6.7.6 hint: After resolving the conflicts, mark them with hint: "git add/rm ", 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-4827-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick e90688b1db5e44d1cfdf986fc501e38da8556f15
# Push it to GitHub
git push --set-upstream origin backport-4827-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-4827-to-release_3_8.