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

JS: expose a fetch method that provide a successful response and enhance docs #4271

Merged
merged 5 commits into from
Mar 7, 2024

Conversation

rldhont
Copy link
Collaborator

@rldhont rldhont commented Mar 5, 2024

  • JS Utils: expose a fetch method that provide a successful response
  • JS main Lizmap: fixing the JS Docs

@rldhont rldhont added javascript Pull requests that update Javascript code run end2end If the PR must run end2end tests or not backport release_3_7 labels Mar 5, 2024
@github-actions github-actions bot added this to the 3.8.0 milestone Mar 5, 2024
@rldhont rldhont removed the run end2end If the PR must run end2end tests or not label Mar 7, 2024
@rldhont rldhont merged commit 4435cf6 into 3liz:master Mar 7, 2024
12 checks passed
@3liz-bot
Copy link
Contributor

3liz-bot commented Mar 7, 2024

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply de3bb2ef8... JS main Lizmap: fixing the JS Docs
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".

stdout
[backport-4271-to-release_3_7 b0a23fbc2] JS Utils: expose a fetch method that provide a successful response
 Author: rldhont <[email protected]>
 Date: Tue Mar 5 18:59:38 2024 +0100
 1 file changed, 86 insertions(+), 29 deletions(-)
Auto-merging assets/src/modules/Lizmap.js
CONFLICT (content): Merge conflict in assets/src/modules/Lizmap.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_7 release_3_7
# Navigate to the new working tree
cd .worktrees/backport-release_3_7
# Create a new branch
git switch --create backport-4271-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ead6e2634d140d998fe6a6cd349d68e38f48586c,de3bb2ef89147f3b4f8b9cb6b7f66a74dcc28453,977acdc7935fbcf0bc5a1d662349455c8149395c,d42e579671fcb1e36c1225830ba987217f5e9c03,be767c7eb412e0221a675ae898bbd173299eb76a
# Push it to GitHub
git push --set-upstream origin backport-4271-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-4271-to-release_3_7.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_7 failed backport javascript Pull requests that update Javascript code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants