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

Add Phix #1111

Closed
wants to merge 62 commits into from
Closed

Add Phix #1111

wants to merge 62 commits into from

Conversation

petelomax
Copy link
Contributor

No description provided.

BNAndras and others added 30 commits November 2, 2023 08:06
* Add test workflow

* Don't use matrix

* Try inline cross

* Pin runner

* Directly download release via CLI

* Add caching

* Extract to bash file

* Last tweaks
Add support for 8th

---------

Co-authored-by: Erik Schierboom <[email protected]>
* Add pyret

* Add pyret

* Update tests/data/pyret.arr

Co-authored-by: Glenn Jackman <[email protected]>

* Update languages.json

Co-authored-by: Glenn Jackman <[email protected]>

* Update tests/data/pyret.arr

Co-authored-by: Glenn Jackman <[email protected]>

---------

Co-authored-by: Glenn Jackman <[email protected]>
* Add LFE support

* Revert formatting changes to README.md

* Fix formatting again

* Update CI badge in README.md (#4)

* Add test workflow (#7)

* Add test workflow

* Don't use matrix

* Try inline cross

* Pin runner

* Directly download release via CLI

* Add caching

* Extract to bash file

* Last tweaks

* Add support for 8th (#1)

Add support for 8th

---------

Co-authored-by: Erik Schierboom <[email protected]>

* add wren support (#8)

* Trigger lines of code counter redeploy (#9)

* Add LFE support

* Revert formatting changes to README.md

* Fix formatting again

* Remove scheme submodule

* Add quotes

* Update lfe.lfe

* Increment comment count

* Decrement blank count

---------

Co-authored-by: Erik Schierboom <[email protected]>
Co-authored-by: Glenn Jackman <[email protected]>
* Adding Pharo to the existing Smalltalk languages

* Looks like tokei doesn't want dots in extensions

* No, the test data files get turned into functions
* Add support for Red

* Disable Red/System files, conflict with Redscript language
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@XAMPPRocky
Copy link
Owner

Thank you for your PR! Can you rebase this on top of main, it seems like CI did not run.

@petelomax
Copy link
Contributor Author

petelomax commented Aug 16, 2024

Sorry, not quite sure what "rebase" means... I'm a "GitHub Desktop" user, I've done a quick "sync fork", dunno if that will help.

And now I appear to have completely spannered it....

How might I completely undo today's mess? Even if this PR is now completely hoiked, I'd like to see what it originally was...

@XAMPPRocky
Copy link
Owner

With the terminal, from your branch run git rebase origin/master

@petelomax
Copy link
Contributor Author

petelomax commented Aug 17, 2024

Got it to say "Current branch master is up to date.".... but the changed files still look like garbage to me.

Feel free to suggest the best way out of this mess. (aka restore time to two days ago, isn't git supposed to be good at that?)

Maybe I should just take a copy of petelomax@bf52f8c then kill my fork, create a new one, and manually copy that back?

@petelomax
Copy link
Contributor Author

bump

@XAMPPRocky
Copy link
Owner

I'd recommend just scrapping the current, using a new main branch, apply your changes there, and force push to this branch.

@petelomax petelomax closed this by deleting the head repository Sep 18, 2024
@petelomax petelomax mentioned this pull request Sep 18, 2024
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.