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

Update eslint #5334

Merged
merged 6 commits into from
Feb 3, 2025
Merged

Update eslint #5334

merged 6 commits into from
Feb 3, 2025

Conversation

Gustry
Copy link
Member

@Gustry Gustry commented Feb 3, 2025

Rebased work from @neo-garaix about #5294

@Gustry Gustry added javascript Pull requests that update Javascript code backport release_3_8 backport release_3_9 labels Feb 3, 2025
@github-actions github-actions bot added this to the 3.10.0 milestone Feb 3, 2025
@Gustry Gustry added the run end2end If the PR must run end2end tests or not label Feb 3, 2025
@Gustry
Copy link
Member Author

Gustry commented Feb 3, 2025

This will enforce CI ESLint.

I would like to backport to 3.8 to easy backports if possible.

@Gustry
Copy link
Member Author

Gustry commented Feb 3, 2025

Maybe we can merge on master and 3.9 and wait for the point release on 3.8 before merging on this branch. I'm not 100% sure about this PR for now.

@Gustry
Copy link
Member Author

Gustry commented Feb 3, 2025

Unrelated test failure

@Gustry Gustry merged commit 69cc4a1 into 3liz:master Feb 3, 2025
16 of 18 checks passed
@Gustry Gustry mentioned this pull request Feb 3, 2025
@3liz-bot
Copy link
Contributor

3liz-bot commented Feb 3, 2025

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 0e12ee275... UPDATE: Apply Eslint
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
Auto-merging package-lock.json
[backport-5334-to-release_3_8 bf9d3fc71] UPDATE: Eslint conf
 Author: neo <[email protected]>
 Date: Wed Jan 29 12:16:55 2025 +0100
 3 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 assets/eslint.config.mjs
Auto-merging assets/src/components/ActionSelector.js
Auto-merging assets/src/components/FeatureToolbar.js
Auto-merging assets/src/components/FeaturesTable.js
Auto-merging assets/src/components/MousePosition.js
Auto-merging assets/src/components/Print.js
Auto-merging assets/src/modules/Action.js
CONFLICT (content): Merge conflict in assets/src/modules/Action.js
Auto-merging assets/src/modules/Config.js
CONFLICT (content): Merge conflict in assets/src/modules/Config.js
Auto-merging assets/src/modules/Digitizing.js
CONFLICT (content): Merge conflict in assets/src/modules/Digitizing.js
Auto-merging assets/src/modules/Edition.js
Auto-merging assets/src/modules/ExecuteJSFromServer.js
Auto-merging assets/src/modules/FeaturesTable.js
Auto-merging assets/src/modules/Geolocation.js
CONFLICT (content): Merge conflict in assets/src/modules/Geolocation.js
Auto-merging assets/src/modules/GeolocationSurvey.js
CONFLICT (content): Merge conflict in assets/src/modules/GeolocationSurvey.js
Auto-merging assets/src/modules/Lizmap.js
CONFLICT (modify/delete): assets/src/modules/LocateByLayer.js deleted in HEAD and modified in 0e12ee275 (UPDATE: Apply Eslint).  Version 0e12ee275 (UPDATE: Apply Eslint) of assets/src/modules/LocateByLayer.js left in tree.
Auto-merging assets/src/modules/Popup.js
CONFLICT (content): Merge conflict in assets/src/modules/Popup.js
Auto-merging assets/src/modules/Search.js
CONFLICT (content): Merge conflict in assets/src/modules/Search.js
Auto-merging assets/src/modules/SelectionTool.js
Auto-merging assets/src/modules/map.js
CONFLICT (content): Merge conflict in assets/src/modules/map.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_8 release_3_8
# Navigate to the new working tree
cd .worktrees/backport-release_3_8
# Create a new branch
git switch --create backport-5334-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 91c4196980ccbcaec4def5c80256f4604b1e1556,0e12ee2750171a62d8bfb28b718a9213109f3878,2568f1fcccbf63b65711e0a0b0c75d1aa173b77f,86fff847fb4cdf0eb39d7485e8d95687ded9ffd8,adf4a117cd483c2fd731218e118840b18a099b6a,edb5c96052d17e23e5383348eacd806f1ef3009a
# Push it to GitHub
git push --set-upstream origin backport-5334-to-release_3_8
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_8

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

@3liz-bot
Copy link
Contributor

3liz-bot commented Feb 3, 2025

The backport to release_3_9 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 86fff847f... REMOVE: 'eslint' dependencies
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
Auto-merging package-lock.json
[backport-5334-to-release_3_9 0041e689e] UPDATE: Eslint conf
 Author: neo <[email protected]>
 Date: Wed Jan 29 12:16:55 2025 +0100
 3 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 assets/eslint.config.mjs
Auto-merging assets/src/components/FeatureToolbar.js
Auto-merging assets/src/components/MousePosition.js
Auto-merging assets/src/components/Print.js
Auto-merging assets/src/modules/Action.js
Auto-merging assets/src/modules/Digitizing.js
Auto-merging assets/src/modules/ExecuteJSFromServer.js
Auto-merging assets/src/modules/Geolocation.js
Auto-merging assets/src/modules/LocateByLayer.js
[backport-5334-to-release_3_9 549dacd00] UPDATE: Apply Eslint
 Author: neo <[email protected]>
 Date: Wed Jan 29 15:53:55 2025 +0100
 36 files changed, 263 insertions(+), 211 deletions(-)
[backport-5334-to-release_3_9 7bd58debf] ADD: CI Eslint
 Author: neo <[email protected]>
 Date: Wed Jan 29 16:03:04 2025 +0100
 1 file changed, 12 insertions(+)
Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json

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-5334-to-release_3_9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 91c4196980ccbcaec4def5c80256f4604b1e1556,0e12ee2750171a62d8bfb28b718a9213109f3878,2568f1fcccbf63b65711e0a0b0c75d1aa173b77f,86fff847fb4cdf0eb39d7485e8d95687ded9ffd8,adf4a117cd483c2fd731218e118840b18a099b6a,edb5c96052d17e23e5383348eacd806f1ef3009a
# Push it to GitHub
git push --set-upstream origin backport-5334-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-5334-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_8 backport release_3_9 failed backport javascript Pull requests that update Javascript code run end2end If the PR must run end2end tests or not
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants