This is an automatic copy of pull request #2439 done by Mergify.
Cherry-pick of 070a6d05d8a3698adfe55c6564bd6ef04d6d529b has failed:
On branch mergify/copy/1.6/pr-2439
Your branch is up to date with 'origin/1.6'.
You are currently cherry-picking commit 070a6d05d.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
deleted: .ci/bindist/linux/debian/README.md
deleted: .ci/bindist/linux/debian/focal/Dockerfile
deleted: .ci/bindist/linux/debian/focal/build-and-publish-docker-image.sh
deleted: .ci/bindist/linux/debian/go.sh
deleted: .ci/bindist/linux/debian/metapackages/clash
deleted: .ci/bindist/linux/debian/metapackages/clash-dev
deleted: .ci/bindist/linux/debian/metapackages/clash-doc
deleted: .ci/bindist/linux/debian/metapackages/clash-prof
deleted: .ci/bindist/linux/debian/scripts/build.py
deleted: .ci/bindist/linux/debian/scripts/build.sh
deleted: .ci/bindist/linux/snap/Dockerfile
deleted: .ci/bindist/linux/snap/build-and-publish-docker-image.sh
deleted: .ci/bindist/linux/snap/go.sh
deleted: .ci/bindist/linux/snap/wrappers/cabal.sh
deleted: .ci/bindist/linux/snap/wrappers/clash.sh
deleted: .ci/bindist/linux/snap/wrappers/clashi.sh
modified: .ci/gitlab/common.yml
modified: .ci/setup.sh
deleted: .ci/snap.sh
modified: .gitlab-ci.yml
renamed: .ci/bindist/README.md -> RELEASING.md
new file: changelog/2023-03-16T11_04_32+01_00_drop_snap
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by them: .ci/bindist/linux/debian/focal/buildinfo.json
deleted by them: .ci/bindist/linux/snap/snap/snapcraft.yaml
both modified: .ci/gitlab/publish.yml
Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
You can also trigger Mergify actions by commenting on this pull request:
- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport ` will backport this PR on `` branch
Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
This is an automatic copy of pull request #2439 done by Mergify. Cherry-pick of 070a6d05d8a3698adfe55c6564bd6ef04d6d529b has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport