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

[+layer/php] Fix missed packages #14581

Merged
merged 1 commit into from
Apr 4, 2021
Merged

[+layer/php] Fix missed packages #14581

merged 1 commit into from
Apr 4, 2021

Conversation

Zebradil
Copy link
Contributor

@Zebradil Zebradil commented Mar 30, 2021

Fetch packages, which can't be found in Melpa anymore, from their GitHub repos:

Fixes #14381

@lebensterben
Copy link
Contributor

@Zebradil

Alternatively you can install these packages from their git repository. That's more conservative than removing them.

@smile13241324
Copy link
Collaborator

smile13241324 commented Mar 30, 2021

Do we have maintained alternatives for these packages? If we have we should simply remove them and switch to the newer ones. Keeping the archived repo may be a work around but as it is not maintained anymore the chance that it will break randomly is pretty high.

Maybe part of the functionality can be obtained by the integrated PHP lsp servers.

@Zebradil
Copy link
Contributor Author

I'm not aware if there are alternatives, but I have no idea where to look for them.

I personally do not use those packages, so I don't have strong opinion regarding update or remove them. The approach proposed by @lebensterben looks safer, I'm going to apply the suggestion for now. And next I'll try to figure out if their functionality is provided by lsp (formatting definitely works, not sure about snippets).

@Zebradil Zebradil changed the title [+layer/php] Remove discontinued packages [+layer/php] Fix missed packages Mar 31, 2021
@JAremko
Copy link
Collaborator

JAremko commented Apr 1, 2021

/rebase 🤔

@duianto yeah that rebase via comment thingy works now. For some reason it doesn't run most of the tests so it's probably useless for us.

cirrus-actions/rebase#65

@Zebradil
Copy link
Contributor Author

Zebradil commented Apr 1, 2021

@lebensterben @smile13241324 How can we come to a conclusion? Should we keep the packages or remove them?

@bystrano Proposed to remove phpcbf in #14574.

Should I remove phpcbf and leave the other package?

@duianto
Copy link
Contributor

duianto commented Apr 4, 2021

How can we come to a conclusion? Should we keep the packages or remove them?

Let's go with the safer choice for now.
Of pulling them from their archived github repositories.

/rebase 🤔

Interesting, I didn't know about rebasing via a comment.

For some reason it doesn't run most of the tests so it's probably useless for us.

It might still be useful to be able to rebase and re-run the tests manually.

@duianto
Copy link
Contributor

duianto commented Apr 4, 2021

It seems to also rebase when the /rebase command is in a quote.
Hopefully it won't rebase when it's wrapped as inline code.

@Zebradil
Copy link
Contributor Author

Zebradil commented Apr 4, 2021

Done fetching from github.

@duianto
Copy link
Contributor

duianto commented Apr 4, 2021

Could you squash the commits into one.

@Zebradil
Copy link
Contributor Author

Zebradil commented Apr 4, 2021

Ready.

I thought it can be done when merging a PR. Mixed up with GitLab, probably.

@duianto
Copy link
Contributor

duianto commented Apr 4, 2021

There is a Squash and merge button, but it mentions The 1 commit so I'm not sure what it will do.

Update:
Ok, it probably means the 1 commit that's left after squashing.

I've gotten the recommendation to use the Rebase and merge button.
When merging PRs.

Snip_2021-04-04_09-44-01_PM

@Zebradil
Copy link
Contributor Author

Zebradil commented Apr 4, 2021

Yeah, there might be a difference between them if the squash and merge is not fast-forward, it'll create a merge-commit. The rebase and merge doesn't create a merge commit, if I understand correctly.

@duianto duianto merged commit 97a238f into syl20bnr:develop Apr 4, 2021
@duianto
Copy link
Contributor

duianto commented Apr 4, 2021

Thank you for contributing to Spacemacs.

@Zebradil Zebradil deleted the remove-discontinued-packages-from-php-layer branch April 4, 2021 20:17
@Zebradil
Copy link
Contributor Author

Zebradil commented Apr 4, 2021

Thank you for taking care of this PR :-)

@duianto
Copy link
Contributor

duianto commented Apr 4, 2021

Thank you for suggesting a fix.

@JAremko
Copy link
Collaborator

JAremko commented Apr 6, 2021

It seems to also rebase when the /rebase command is in a quote.
Hopefully it won't rebase when it's wrapped as inline code.

I removed /rebase since it doesn't trigger tests. And there is no clean workaround. Also it's a bit confusing for PR authors.


Looks like it can work with private token cirrus-actions/rebase#65 🤔

@differentMonster
Copy link

How do you guys fix this package by download using git ? where should i put the file ? can anyone elaborate more about the step ?

@Zebradil
Copy link
Contributor Author

@differentMonster just update your spacemacs distribution:

# For Linux
git -C ~/.emacs.d pull

@differentMonster
Copy link

differentMonster commented May 13, 2021

@Zebradil so after i git clone the package to the +lang folder and do the git -C ~/.emacs.d pull ?

i have this error
error: Your local changes to the following files would be overwritten by merge:

@lebensterben
Copy link
Contributor

you'd can git add + git commit your local change

or git restore to discard your local changes

or git stash to save your local changes in stash

If you've no idea what's going on, delete .emacs.d and reinstall.

@Zebradil
Copy link
Contributor Author

@differentMonster you do not need to clone any package additionally. Just update the spacemacs, it already includes changes from this PR.

@differentMonster
Copy link

@lebensterben @Zebradil Got it work guys, thanks you guys guidelines and update the spacemacs package 👯

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.

Packages 'php-auto-yasnippet' and 'phpcbf' in php layer unavailable
6 participants