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

Reduce mainLizmap dependencies in Action module #5036

Merged
merged 1 commit into from
Dec 3, 2024

Conversation

neo-garaix
Copy link
Contributor

Based on #3857

Funded by 3liz

@github-actions github-actions bot added this to the 3.10.0 milestone Nov 29, 2024
@rldhont rldhont added refactoring javascript Pull requests that update Javascript code backport release_3_9 labels Nov 29, 2024
@neo-garaix neo-garaix force-pushed the red-ml-dep/action-module branch from db7d520 to 1141edf Compare December 3, 2024 11:01
@neo-garaix neo-garaix marked this pull request as ready for review December 3, 2024 11:11
@rldhont rldhont added the run end2end If the PR must run end2end tests or not label Dec 3, 2024
assets/src/modules/Action.js Outdated Show resolved Hide resolved
assets/src/modules/Lizmap.js Outdated Show resolved Hide resolved
@neo-garaix neo-garaix force-pushed the red-ml-dep/action-module branch from 9509ee1 to 644fd96 Compare December 3, 2024 14:52
@rldhont rldhont merged commit d90c20e into 3liz:master Dec 3, 2024
13 checks passed
@3liz-bot
Copy link
Contributor

3liz-bot commented Dec 3, 2024

The backport to release_3_9 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 644fd965a... UPDATE: Remove mainLizmap
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 assets/src/modules/Action.js
CONFLICT (content): Merge conflict in assets/src/modules/Action.js

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-5036-to-release_3_9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 644fd965a61ee609e7812bcb932bd1b44c041953
# Push it to GitHub
git push --set-upstream origin backport-5036-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-5036-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_9 failed backport javascript Pull requests that update Javascript code refactoring run end2end If the PR must run end2end tests or not
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants