Skip to content

Conversation

@Naya-01
Copy link
Contributor

@Naya-01 Naya-01 commented Apr 8, 2025

Make elementmap.xml path resolution dynamic by using CLICK_DATADIR variable

@tbarbette
Copy link
Owner

Try multiple path in an if exists chain. If it's not in datadir, then /usr/local/... And also verify it works without doing make install and running from bin/click directly, because we always do that.

@Naya-01
Copy link
Contributor Author

Naya-01 commented Apr 8, 2025

how do you change the location of elementmap.xml without 'make install'?

@tbarbette
Copy link
Owner

Can you rebase? The pipeline should be fixed now.

@Naya-01
Copy link
Contributor Author

Naya-01 commented Apr 11, 2025

I sync the repo all test passed but after the rebase, the test failed

@tbarbette
Copy link
Owner

That one is a false positive I think, I restarted it

@tbarbette
Copy link
Owner

Can you rebase?

@Naya-01
Copy link
Contributor Author

Naya-01 commented Apr 23, 2025

Can you rebase?

Done! Let me know if it's good like this or not.

@tbarbette
Copy link
Owner

Maybe you forgot to fetch before the rebase? You're still 4 commits behind.

@Naya-01
Copy link
Contributor Author

Naya-01 commented Apr 24, 2025

it's normal because the “hash” of the commits has changed with the rebase but if you look at the history you can see that the commits are still there.

@tbarbette
Copy link
Owner

You have modifications from me in your branch, which is not normal.
You have to:

git remote add tbarbette [email protected]:tbarbette/fastclick.git
git fetch --all
git rebase tbarbette/main
[skip commits you duplicated]
git push --force

@Naya-01 Naya-01 temporarily deployed to GITLAB_PASSWORD April 24, 2025 11:52 — with GitHub Actions Inactive
@tbarbette tbarbette merged commit 24df0bd into tbarbette:main May 12, 2025
13 checks passed
@tbarbette
Copy link
Owner

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants