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

Solved the issue 134 #149

Merged
merged 1 commit into from
Dec 14, 2024
Merged

Solved the issue 134 #149

merged 1 commit into from
Dec 14, 2024

Conversation

teodor994
Copy link

@teodutu teodutu added needs-rendering The PR makes changes to the website that need to be rendered student-contrib Fix or improvement made by a student labels Dec 13, 2024
Copy link

Copy link

@teodutu teodutu left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution. Most of the checkers are working fine. I made a bunch of inline comments. Address them and then below is some more general feedback.

  • Update the paths used by the tester scripts and Makefiles from ../ to ../src/
  • Tasks such as aslr and stack-protector require changing the Makefiles. Add TODOs to them. Ideally update generate_skels.py to generate support Makefiles from those in solution/.
  • Fix the CI/CD failures [1]. Spellcheck sometimes outputs false positives caused by words missing from these lists [2]. To fix those, make a PR to add those missing words this repo [2] (use the makefile in [2] to keep the lists sorted).
  • Change your commit message to (according to the contributing guidelines [1] ):
chapters/data: Add checkers for `memory-security` tasks

<the description of your PR>

Resolves #134

<your signed-off-by line>

[1] https://github.com/cs-pub-ro/operating-systems/pull/149/checks
[2] https://github.com/open-education-hub/actions/tree/main/spellcheck/config
[3] https://github.com/cs-pub-ro/operating-systems/blob/main/CONTRIBUTING.md#commits

@github-actions github-actions bot added area/tasks Update to tasks topic/data Related to "Data" chapter kind/improve Improve / Update existing content / item kind/new New content / item labels Dec 14, 2024
@teodutu
Copy link

teodutu commented Dec 14, 2024

You didn't overwrite your first commit (git commit --amend), but created a new onw instead. Now do this to squash them together into a single one:

  1. git rebase -i main
  2. This will open your default editor and you'll see your 2 commits. Replace the first word "pick" with "s" (from "squash") on the second line, then save and exit.
  3. A new editor window will open with the 2 commit messages cincatenated, allowing you to modify them. Only keep the latter. And change Resolves #134 to Fixes #134 as I didn't see the issue linked with this PR. Maybe Github doesn't support "Resolves" like its docs say [1]?
  4. git push -f

[1] https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword

@Alex-deVis
Copy link

Instead of following the premium tutorial wrote by @teodutu (which he rewrites everytime in a different way), you could follow this guide [1]. The gif shows you a clear example of how to do a git rebase -i.

[1] https://medium.com/@slamflipstrom/a-beginners-guide-to-squashing-commits-with-git-rebase-8185cf6e62ec

@teodutu teodutu linked an issue Dec 14, 2024 that may be closed by this pull request
@teodutu teodutu added needs-rendering The PR makes changes to the website that need to be rendered and removed needs-rendering The PR makes changes to the website that need to be rendered labels Dec 14, 2024
Copy link

Copy link

@teodutu teodutu left a comment

Choose a reason for hiding this comment

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

The checkers are OK. My only questions are why are you running sudo bash ./run_all_tests.sh instead of just ./run_all_tests.sh in make check.

Copy link

@teodutu teodutu left a comment

Choose a reason for hiding this comment

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

The content is fine. Great job! Fix the linters and then I'll merge this.

@teodor994 teodor994 force-pushed the Update branch 2 times, most recently from bd580c3 to 01eb286 Compare December 14, 2024 13:05
@teodutu
Copy link

teodutu commented Dec 14, 2024

You need to rebase the main branch to remove the merge conflicts.

@teodutu
Copy link

teodutu commented Dec 14, 2024

@Alex-deVis can you figure out what's the conflict here?

@Alex-deVis
Copy link

I'll take a look in 30m

Done solving the issue 134 :
chapters/data/memory-security/drills/tasks: Add solutions and checkers cs-pub-ro#134
Added the generate_skels.py infrastructure to generate the skeletons
Added checkers for the tasks which needed one
Updated the README.md for every task with useful information on how to use:
-`make skels` command
-the checker
Added solution
Updated generate_skels.py to add support for Makefile-uncommenting lines.

Fixes cs-pub-ro#134

Signed-off-by: Vica Teodor Andrei <[email protected]>
@teodutu teodutu merged commit 85302e1 into cs-pub-ro:main Dec 14, 2024
2 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/tasks Update to tasks kind/improve Improve / Update existing content / item kind/new New content / item needs-rendering The PR makes changes to the website that need to be rendered student-contrib Fix or improvement made by a student topic/data Related to "Data" chapter
Projects
None yet
Development

Successfully merging this pull request may close these issues.

chapters/data/memory-security/drills/tasks: Add solutions and checkers
3 participants