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
249 stars 141 forks source link

For admin, check plugin version first, before checking for warnings #4471

Closed Gustry closed 1 month ago

Gustry commented 1 month ago

It's look more important to me to :

An up to date version might give him more updates in the plugin and errors.

I consider the plugin update easy to do, so we can keep the dialog "not closable" ?

I know the backport on 3.6 will fail, but I will propose this small update

3liz-bot commented 1 month ago

The backport to release_3_6 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` error: could not apply a61a27a40... For admin, check plugin version first, before checking for warnings 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 ``` CONFLICT (modify/delete): assets/src/modules/ExecuteJSFromServer.js deleted in HEAD and modified in a61a27a40 (For admin, check plugin version first, before checking for warnings). Version a61a27a40 (For admin, check plugin version first, before checking for warnings) of assets/src/modules/ExecuteJSFromServer.js left in tree. Auto-merging lizmap/modules/view/controllers/lizMap.classic.php CONFLICT (content): Merge conflict in lizmap/modules/view/controllers/lizMap.classic.php Auto-merging lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties ```

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_6 release_3_6
# Navigate to the new working tree
cd .worktrees/backport-release_3_6
# Create a new branch
git switch --create backport-4471-to-release_3_6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a61a27a404ba9acdd3fa2908e2ec12fff18c78e9
# Push it to GitHub
git push --set-upstream origin backport-4471-to-release_3_6
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_6

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

3liz-bot commented 1 month ago

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` error: could not apply a61a27a40... For admin, check plugin version first, before checking for warnings 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 ``` CONFLICT (modify/delete): assets/src/modules/ExecuteJSFromServer.js deleted in HEAD and modified in a61a27a40 (For admin, check plugin version first, before checking for warnings). Version a61a27a40 (For admin, check plugin version first, before checking for warnings) of assets/src/modules/ExecuteJSFromServer.js left in tree. Auto-merging lizmap/modules/view/controllers/lizMap.classic.php CONFLICT (content): Merge conflict in lizmap/modules/view/controllers/lizMap.classic.php Auto-merging lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties ```

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-4471-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a61a27a404ba9acdd3fa2908e2ec12fff18c78e9
# Push it to GitHub
git push --set-upstream origin backport-4471-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-4471-to-release_3_7.