Skip to content

Apply fixes for YAML file formatting#10901

Merged
DelazJ merged 2 commits intoqgis:masterfrom
DelazJ:yamllint
Apr 13, 2026
Merged

Apply fixes for YAML file formatting#10901
DelazJ merged 2 commits intoqgis:masterfrom
DelazJ:yamllint

Conversation

@DelazJ
Copy link
Copy Markdown
Collaborator

@DelazJ DelazJ commented Apr 10, 2026

Another PR improving quality using pre-commit hooks (refs #10856)

Goal:

Ticket(s): #

  • Backport to LTR documentation is requested

@DelazJ DelazJ added backport release_3.44 On merge create a backported pull request to 3.44 Backend labels Apr 10, 2026
Copy link
Copy Markdown
Member

@timlinux timlinux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@DelazJ DelazJ merged commit 97e8377 into qgis:master Apr 13, 2026
5 checks passed
@DelazJ DelazJ deleted the yamllint branch April 13, 2026 12:08
@qgis-bot
Copy link
Copy Markdown
Collaborator

The backport to release_3.44 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply ce5dbff6e7... Apply fixes for YAML file formatting
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 set advice.mergeConflict false"

stdout
[backport-10901-to-release_3.44 183ced67c9] Add checker for YAML file formatting
 Author: Harrissou Sant-anna <delazj@gmail.com>
 Date: Wed Apr 8 23:32:18 2026 +0200
 1 file changed, 19 insertions(+), 7 deletions(-)
Auto-merging .github/workflows/doctest.yml
CONFLICT (content): Merge conflict in .github/workflows/doctest.yml
Auto-merging docs_conf.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.44 release_3.44
# Navigate to the new working tree
cd .worktrees/backport-release_3.44
# Create a new branch
git switch --create backport-10901-to-release_3.44
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 1fda2f0a296e4b9af1d180e320abd68ad173e0b7,ce5dbff6e71314702dd5b4d46b546d420340c8a1
# Push it to GitHub
git push --set-upstream origin backport-10901-to-release_3.44
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3.44

Then, create a pull request where the base branch is release_3.44 and the compare/head branch is backport-10901-to-release_3.44.

DelazJ added a commit to DelazJ/QGIS-Documentation that referenced this pull request Apr 13, 2026
DelazJ added a commit that referenced this pull request Apr 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Backend backport release_3.44 On merge create a backported pull request to 3.44

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants