Skip to content

Add Cyfrin's glossary to Resources in the docs #16081

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

Merged
merged 1 commit into from
Aug 14, 2025

Conversation

PatrickAlphaC
Copy link
Contributor

We have a glossary with many of the terms taught in Cyfrin Updraft.

https://www.cyfrin.io/glossary

Figured it would be a good resource to add!

(Note: It's different from what's in #15339)

Copy link

github-actions bot commented Jun 9, 2025

Thank you for your contribution to the Solidity compiler! A team member will follow up shortly.

If you haven't read our contributing guidelines and our review checklist before, please do it now, this makes the reviewing process and accepting your contribution smoother.

If you have any questions or need our help, feel free to post them in the PR or talk to us directly on the #solidity-dev channel on Matrix.

@r0qs r0qs requested a review from mehtavishwa30 June 11, 2025 10:26
@cameel
Copy link
Member

cameel commented Aug 5, 2025

Ping @mehtavishwa30.

@cameel cameel changed the title Added glossary to resources Add Cyfrin's glossary to esources Aug 5, 2025
@cameel cameel changed the title Add Cyfrin's glossary to esources Add Cyfrin's glossary to Resources Aug 5, 2025
@cameel cameel changed the title Add Cyfrin's glossary to Resources Add Cyfrin's glossary to Resources in the docs Aug 5, 2025
@cameel cameel force-pushed the feat/updraft-addition branch from b98c562 to aa4d55b Compare August 5, 2025 10:08
@mehtavishwa30 mehtavishwa30 enabled auto-merge (rebase) August 12, 2025 11:49
@cameel cameel disabled auto-merge August 12, 2025 11:51
@cameel
Copy link
Member

cameel commented Aug 12, 2025

@mehtavishwa30 This needs a rebase and squashing. I think you used the "Update branch" feature to do it, but without switching it to "rebase". If you do that, it creates a merge commit (which we do not want).

@mehtavishwa30
Copy link
Contributor

@cameel got it. it also has some failing checks. What are those about?

@cameel
Copy link
Member

cameel commented Aug 12, 2025

There seems to be some new rate-limiting going on with our Foundry version check and that makes a lot of external test jobs fail.

They're unrelated to the PR and they're not required checks so you can ignore them.

Copy link
Member

@cameel cameel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll rebase and merge.

@cameel cameel force-pushed the feat/updraft-addition branch from e467a34 to 0e8ac1b Compare August 12, 2025 13:08
@mehtavishwa30
Copy link
Contributor

Well, seems like a few required tests are failing now. @cameel will wait for you to check those before rebasing and merging.

@cameel
Copy link
Member

cameel commented Aug 13, 2025

It's already reabased and fine to merge, but there seems to be something weird happening on CircleCI side. All of these jobs should not be failing.

@PatrickAlphaC
Copy link
Contributor Author

I can make a new PR if that's easier

@clonker clonker force-pushed the feat/updraft-addition branch from 853cf9d to 0e8ac1b Compare August 14, 2025 07:51
@clonker clonker force-pushed the feat/updraft-addition branch from 0e8ac1b to 47e0335 Compare August 14, 2025 08:00
@clonker
Copy link
Member

clonker commented Aug 14, 2025

Maybe it would have been easier after all, it seems like the commit was borked somehow or at least the circleci cache for it was borked. :D Anyways, I've performed some git surgery

git reset --soft HEAD~1
git commit --author="Patrick Collins <[email protected]>" -m "feat: added updraft glossary for solidity and smart contract terms" --date="Mon Jun 9 09:50:22 2025 -0400"
git push --force-with-lease tmp feat/updraft-addition

where tmp is your remote. This creates a new commit with the exact same author info and contents (but with me as the committer, that's why it's showing both our avatars next to the commit). That causes circle ci to start fresh cache-wise. No need for a new PR.

@clonker clonker merged commit d8293de into ethereum:develop Aug 14, 2025
68 of 74 checks passed
@cameel
Copy link
Member

cameel commented Aug 14, 2025

Well, when pushing the squashed commit I first accidentally pushed it as a branch named PatrickAlphaC/feat/updraft-addition instead of pushing feat/updraft-addition to PatrickAlphaC and quickly deleted it. This probably started CI on that branch and immediately killed it, failing all jobs. I did not connect this to the CI failure here, because it's a completely new branch, but now that you mentioned it, it could have confused CircleCI. I remember that weird things used to happen with CircleCI if you renamed a branch just before opening a PR, by renaming it locally, pushing it and deleting the branch with the old name. The CI would be all red from the start in such a PR.

It's just very unintuitive that CircleCI gets confused by something like this. The way I understand it, the checks are supposed to be connected with a branch, not with a commit. But I guess they must be doing some caching to avoid rerunning multiple times on the same commit and that breaks this mental model in unexpected ways.

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

Successfully merging this pull request may close these issues.

4 participants