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

Rebase original branch #5

Merged
merged 250 commits into from
Feb 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
250 commits
Select commit Hold shift + click to select a range
7559117
Fix zig_exe location in Build struct
sashka Feb 5, 2024
4b1ae61
Merge pull request 'Fix zig_exe location in Build struct' (#45) from …
Feb 6, 2024
8257ccb
Text improvement
Feb 11, 2024
099d0bb
Merge pull request 'Text improvement' (#48) from chrboesch-patch-1 in…
Feb 11, 2024
55b2ac4
Zig version adjusted.
Feb 16, 2024
48b2032
Merge pull request 'Zig version adjusted.' (#50) from build_fix into …
Feb 16, 2024
9e48c9a
Added notes to exercise 94 c_math.
Feb 28, 2024
2773044
Merge pull request 'Added notes to exercise 94 c_math.' (#53) from 09…
Feb 28, 2024
6984345
Added threading exercise
Mar 5, 2024
9e9cf40
Merge pull request 'Added threading exercise' (#54) from 104_threadin…
Mar 5, 2024
d0519d1
Fixed unicode literal
Mar 8, 2024
6b46b26
Merge pull request 'Fixed unicode literal' (#55) from i52 into main
Mar 8, 2024
08cc60b
Minor corrections to the "contributing"
Mar 12, 2024
e387732
Merge pull request 'Minor corrections to the "contributing"' (#56) fr…
Mar 12, 2024
c8f081f
fix exercise 82 output
Mar 14, 2024
9844123
Improved the explanation about passing arguments and added an example.
Mar 14, 2024
a87e7c8
Merge pull request 'Improved the explanation about passing arguments …
Mar 14, 2024
5728ccc
Merge pull request 'fix exercise 82 output' (#58) from dolichomps/exe…
Mar 14, 2024
abed92c
Changes for a new Zig version.
Mar 14, 2024
2092f35
Merge pull request 'Changes for a new Zig version.' (#60) from versio…
Mar 14, 2024
2b9e3da
Fixed the renaming of std.os to std.posix
Mar 21, 2024
cdaa246
Merge pull request 'Fixed the renaming of std.os to std.posix' (#64) …
Mar 21, 2024
d65e3f3
Added second threading exercise.
Mar 23, 2024
dabd9a5
Merge pull request 'Added second threading exercise.' (#65) from thre…
Mar 23, 2024
95cfeaa
Update exercises/105_threading2.zig
Mar 23, 2024
8e6612a
Update .woodpecker/eowyn.yml
Mar 24, 2024
0d1c76a
Update .woodpecker/eowyn.yml
Mar 24, 2024
a3de4e3
Update .woodpecker/eowyn.yml
Mar 24, 2024
ec6f6c5
added exercise/106_files.zig
dizzyi Mar 24, 2024
66d08f1
modified build.zig
dizzyi Mar 25, 2024
23b11a7
106_files.zig format
dizzyi Mar 25, 2024
74a6e60
add patch files for 106_files.zig
dizzyi Mar 25, 2024
9ce889b
106_files.zig actual test
dizzyi Mar 26, 2024
9bf7a84
106_files.patches actual
dizzyi Mar 26, 2024
92ea671
remove header of patch files of 106
dizzyi Mar 26, 2024
2c44f3e
specify directory on patch file 106
dizzyi Mar 26, 2024
5f74c7f
specify directory on patch file 106
dizzyi Mar 26, 2024
69bc9a0
Pass CI test locally
dizzyi Mar 26, 2024
223fc79
106 & 107
dizzyi Mar 27, 2024
05589f8
added format parameter {d}
dizzyi Mar 27, 2024
db21ab9
Merge branch 'main' into main
Mar 27, 2024
2091972
Merge pull request 'added exercise/106_files.zig' (#66) from dizzyi_s…
Mar 27, 2024
86ac326
fix typo
Mar 28, 2024
e06cdc0
Merge branch 'main' into i69
Mar 28, 2024
ba4709b
Merge pull request 'fix typo' (#70) from i69 into main
Mar 28, 2024
f06c1f2
Fix breaking zig change to @fieldParentPtr parameters
kamidev Mar 31, 2024
c0ff1b7
Merge pull request 'WIP - fix breaking zig change to @fieldParentPtr'…
Apr 2, 2024
7875a0f
Zig version changed
Apr 2, 2024
84864d8
Merge pull request 'Zig version changed' (#73) from pr72 into main
Apr 3, 2024
564916d
Update README.md
Apr 3, 2024
7732cd7
Greater gradation of timers built into the threads
Apr 10, 2024
2122c47
Merge pull request 'Greater gradation of timers built into the thread…
Apr 10, 2024
ba2a962
Additional timer in thread start added
Apr 10, 2024
376a839
Merge branch 'main' into I75
Apr 10, 2024
3c9c55d
Merge pull request 'Additional timer in thread start added' (#77) fro…
Apr 10, 2024
72e3d6e
Update .woodpecker/eowyn.yml
Apr 10, 2024
f4f8eb7
Fixed woodpecker warnings
Apr 10, 2024
9432c2b
Merge pull request 'Fixed woodpecker warnings' (#79) from pr78 into main
Apr 10, 2024
aa74dde
fixing little typo on exercise 107_files2.zig
susubub Apr 17, 2024
8f36619
Merge pull request 'fixing little typo on exercise 107_files2.zig' (#…
Apr 18, 2024
c94eb33
Switch to new zig dev release 0.13
Apr 20, 2024
ce0a6cc
Merge pull request 'Switch to new zig dev release 0.13' (#81) from r0…
Apr 20, 2024
e7eaa08
Update .woodpecker/eowyn.yaml
Apr 24, 2024
a2a0a6e
Merge pull request 'Update .woodpecker/eowyn.yaml' (#82) from chrboes…
Apr 24, 2024
b484be9
Update .woodpecker/eowyn.yaml
Apr 24, 2024
9ce4a7d
Merge pull request 'Update .woodpecker/eowyn.yaml' (#83) from wp-patc…
Apr 24, 2024
4dbd056
fix: typo: % instead of @ for a builtin function
d-hain May 4, 2024
5c2354a
fix: typo: removed extra s
d-hain May 4, 2024
c936c5e
fix: many grammatical errors
d-hain May 4, 2024
8cb2a5a
fix: some grammatical errors
d-hain May 4, 2024
27db311
Merge pull request 'fix: typo: % instead of @ for a builtin function'…
May 4, 2024
09e2f37
Merge branch 'main' into typo-fix-094-098
May 4, 2024
e182d1f
Merge pull request 'fix: typos in exercises 094 and 098' (#87) from d…
May 4, 2024
165cc19
Fix patches for 106 and 107
May 4, 2024
1ac46d7
Merge pull request 'Fix patches for 106 and 107' (#88) from wp433 int…
May 4, 2024
19bd874
Fix some typos
May 6, 2024
6c23f26
Merge branch 'main' into typos
May 6, 2024
8345e83
Merge pull request 'Fix some typos' (#89) from typos into main
May 6, 2024
5da194b
Add devcontainer.json
aquilarafa May 6, 2024
dfdaf03
Merge pull request 'Add devcontainer config' (#90) from aquilarafa/ex…
May 6, 2024
67f87a7
Nobody wants the long version of finding out if a variable is set.
May 10, 2024
49c54fb
Merge pull request 'Nobody wants the long version of finding out if a…
May 10, 2024
efe2d19
Update exercises/105_threading2.zig
May 11, 2024
776316e
Merge pull request 'Update exercises/105_threading2.zig' (#95) from r…
May 12, 2024
a6d13af
the Earth
rofrol May 20, 2024
6223dc0
Verbs agree with the head of the noun phrase, not the closest noun
May 25, 2024
b224ed5
Fixed the changes from reworking std.Progress.
May 29, 2024
227bcb1
Merge pull request 'Fixed the changes from reworking std.Progress.' (…
May 29, 2024
c2caf1a
Merge branch 'main' into the-earth
May 30, 2024
914141e
Merge pull request 'the Earth' (#97) from rofrol/ziglings--exercises:…
May 30, 2024
0279826
Ignore .zig-cache for new zig versions
NicoElbers May 30, 2024
5c9b9bd
Merge pull request 'Ignore .zig-cache for new zig versions' (#102) fr…
May 30, 2024
7f78701
Merge branch 'main' into grammar
Jun 8, 2024
99c9c42
Merge pull request 'Verbs agree with the head of the noun phrase, not…
Jun 8, 2024
984f4af
New Zig version
Jun 8, 2024
bb032fa
Merge pull request 'New Zig version' (#106) from readme into main
Jun 8, 2024
1f5ec78
fixed typo
Jun 8, 2024
65387dd
Merge pull request 'fixed typo' (#107) from typo into main
Jun 8, 2024
c9e5c7d
English fixes for 107_files2.zig
hippietrail Jun 12, 2024
582a255
English fixes for 106_files.zig
hippietrail Jun 12, 2024
6d3d365
Merge pull request 'English fixes for 107_files2.zig' (#108) from hip…
Jun 14, 2024
83f1670
Calling `split` is deprecated
cannero Jun 16, 2024
c0c315b
Merge pull request 'Calling `split` is deprecated' (#110) from canner…
Jun 17, 2024
5c000ce
Fixes because of a new Zig version, which changes some functions.
Jun 17, 2024
da46008
Merge pull request 'Fixes because of a new Zig version, which changes…
Jun 17, 2024
3763f97
046: Show usage of `.?` and hint towards new solution.
alexmchughnz Jun 23, 2024
f656e95
Add patch.
alexmchughnz Jun 23, 2024
f496d79
Merge pull request '046: Show usage of `.?` and hint towards new solu…
Jun 24, 2024
2259a18
attempt at implementing #113 "Add a way to do one random exercise"
hippietrail Jun 25, 2024
94fe012
Merge pull request 'attempt at implementing #113 "Add a way to do one…
Jun 25, 2024
5bf56f0
Rename 'std.rand' to 'std.Random'
Jun 25, 2024
7705473
Merge pull request 'Rename 'std.rand' to 'std.Random'' (#118) from fi…
Jun 25, 2024
c33898b
Update .woodpecker/eowyn.yaml
Jun 25, 2024
140c22e
Merge pull request 'Update .woodpecker/eowyn.yaml' (#119) from chrboe…
Jun 25, 2024
4401cf8
document -Drandom
hippietrail Jul 6, 2024
1fd6aa1
Merge branch 'main' into random-exercise
Jul 6, 2024
e8f0919
Merge pull request 'document -Drandom' (#124) from hippietrail/exerci…
Jul 6, 2024
e7dcf0b
fix build files broken by latest 0.14.0-dev changes to Build.Step.Mak…
bsubei Jul 21, 2024
4cc1158
fix tests build file broken by addRemoveDirTree now requiring LazyPath
bsubei Jul 21, 2024
b26e3b2
Fixed error message through a TAB in the comment, see https://github.…
Aug 4, 2024
28320b1
Merge pull request 'Fixed error message through a TAB in the comment,…
Aug 4, 2024
a671def
Merge branch 'main' into fix-0.14.0-build-changes
Aug 4, 2024
d6887f2
Merge pull request 'Fix #127 and #129 by updating the build files to …
Aug 4, 2024
1ba7448
Changed needed zig version.
Aug 4, 2024
94d6a4d
Merge pull request 'Changed needed zig version.' (#138) from pr_130 i…
Aug 4, 2024
70b0522
Add build parameter to start at a specific exercise
mythmon Aug 8, 2024
e2f356d
Merge pull request 'Add build parameter to start at a specific exerci…
Aug 9, 2024
17f9312
Clarification in description for ranges in loops.
Aug 11, 2024
97c8bc3
Merge pull request 'Clarification in description for ranges in loops.…
Aug 11, 2024
3baf0ae
Simplified de-referencing for clarification
Aug 11, 2024
118c125
Merge pull request 'Simplified de-referencing for clarification' (#14…
Aug 11, 2024
031e11a
Added license to contributing
Aug 19, 2024
ed88236
Merge pull request 'Added license to contributing' (#146) from contri…
Aug 19, 2024
dab5197
Fixes changes in zig build system.
Aug 22, 2024
8e35cf7
Insert wrong version number into build file.
Aug 22, 2024
296a2b5
Merge pull request 'Fixes changes in zig build system.' (#148) from i…
Aug 22, 2024
b2f56c7
Fixes several changes in std.builtin.zig
Sep 2, 2024
2e5b570
Merge pull request 'Fixes several changes in std.builtin.zig' (#150) …
Sep 2, 2024
a675945
fixed typo: the date in version changes
Seeingu Sep 4, 2024
b0f859c
Merge pull request 'fixed typo: the date in version changes' (#153) f…
Sep 4, 2024
7f1df86
Reseted the simplification for de-referencing.
Sep 4, 2024
49e0c32
Merge branch 'main' into i152
Sep 4, 2024
c9a98ad
Merge pull request 'Reseted the simplification for de-referencing.' (…
Sep 4, 2024
c8b60f2
Update LICENSE
Sep 7, 2024
b9cde40
Merge pull request 'Update LICENSE' (#155) from chrboesch-lic-patch-1…
Sep 7, 2024
26f4785
Corrects the description of the new @typeInfo().@"struct".fields
Sep 7, 2024
3dc79ca
Merge pull request 'Corrects the description of the new @typeInfo().@…
Sep 7, 2024
f28346d
New patch file for 82
Sep 7, 2024
995a7c8
Merge pull request 'New patch file for 82' (#158) from p_struct_typei…
Sep 7, 2024
827146f
Update README.md
Sep 11, 2024
102ba8c
Merge pull request 'Update README.md' (#160) from chrboesch-readme in…
Sep 11, 2024
335a78f
108: Add a exercise for a labeled switch
nm-remarkable Sep 15, 2024
580e126
Add .patch for 108_labeled_switch
nm-remarkable Sep 15, 2024
798bb40
update zig version in build and readme
nm-remarkable Sep 16, 2024
db569a1
update labeled switch to also have a break statement
nm-remarkable Sep 16, 2024
d9ce186
downgrade zig version to eowyn version
nm-remarkable Sep 16, 2024
ed1a20d
improve explanantions in labeled switch
nm-remarkable Sep 18, 2024
f0c2c56
update108 .patch due to line change
nm-remarkable Sep 18, 2024
94b5b4b
Merge pull request 'Add a new exercise for a labeled switch' (#161) f…
Sep 19, 2024
d1b49f3
Minor improvements.
Sep 20, 2024
67c8241
Merge pull request 'Minor improvements.' (#163) from patch_lbl_sw int…
Sep 20, 2024
96df8ba
Added Dave as initiator of Ziglings.
Sep 20, 2024
775f5eb
Merge pull request 'Added Dave as initiator of Ziglings.' (#164) from…
Sep 20, 2024
9d1da38
Deleted .devcontainer because ist was a test.
Sep 20, 2024
173af62
Merge pull request 'Deleted .devcontainer because ist was a test.' (#…
Sep 20, 2024
0247875
Rephrase instruction for clarity
factormystic Oct 26, 2024
e2b20b3
Merge pull request 'Rephrase instruction for clarity' (#170) from fac…
Oct 27, 2024
8f49400
Fixed patch from quiz7 after text changes
Oct 28, 2024
71b4f5e
Merge pull request 'Fixed patch from quiz7 after text changes' (#171)…
Oct 28, 2024
f629d78
reuse fields
rofrol Nov 2, 2024
286439c
zero
rofrol Nov 2, 2024
530dcde
patch
rofrol Nov 2, 2024
d0d31ae
Merge pull request 'reuse fields' (#173) from rofrol/ziglings--exerci…
Nov 2, 2024
fb018d2
Improved maximumNarcissism
Nov 2, 2024
150b3de
Merge pull request 'Improved maximumNarcissism' (#174) from pr173 int…
Nov 2, 2024
c90d601
created a new exercise about vectors in zig, gave it number 109
Nov 3, 2024
75e5e53
removed commented solution lines in vectors exercise, added ??? into …
Nov 3, 2024
8cce587
added patch file for 109_vectors
Nov 7, 2024
46e8fc0
line ending format patch attempt
Nov 7, 2024
bfed660
Fixed formating, created patch file.
Nov 7, 2024
731a3eb
Merge pull request 'vectors-addition' (#177) from vectors-addition in…
Nov 7, 2024
97c2ea2
Added SIMD.
Nov 7, 2024
37a0f42
Fixed link to format source code.
Nov 7, 2024
4d4eefa
Merge pull request 'Fixed link to format source code.' (#180) from fi…
Nov 7, 2024
e55f8e8
Added missing space after a sentence.
innerviewer Nov 7, 2024
33d61cb
Minor case-related changes.
innerviewer Nov 8, 2024
2606e53
Merge pull request 'Added missing space after a sentence.' (#182) fro…
Nov 8, 2024
fb46871
Merge branch 'main' into readme
Nov 8, 2024
ae541a0
Merge pull request 'Added SIMD.' (#178) from readme into main
Nov 8, 2024
0d94588
Deleted unnecessary pointer.
Nov 8, 2024
63951df
Merge pull request 'Deleted unnecessary pointer.' (#185) from fix-176…
Nov 8, 2024
02bd0b2
Merge branch 'main' into fix-consistent-naming-106
Nov 9, 2024
83e0087
Added patch file.
innerviewer Nov 9, 2024
8da60ed
Merge pull request 'Minor case-related changes.' (#184) from innervie…
Nov 9, 2024
f446402
Updated credits
Dec 22, 2024
105c987
Updated credits
Dec 22, 2024
5ed3af5
Merge pull request 'Updated credits' (#192) from readme into main
Dec 22, 2024
de353bc
Update: 108 Labeled switch example to contain default case for exhaus…
mikkurogue Jan 4, 2025
26978cb
Fix typo vaild → valid
zyzzyxdonta Jan 4, 2025
468e3d7
Merge pull request 'Fix typo vaild → valid' (#197) from zyzzyxdonta/z…
Jan 4, 2025
5cdaee7
Update: Remove the 4th branch in favour of just making that the else …
Jan 7, 2025
c2dcaf3
Use print alias in exercise 100_for4.zig
Zorgatone Jan 7, 2025
6b29634
Fix patch after print alias fix in 100_fo4.zig
Zorgatone Jan 7, 2025
87b258d
Fix a typo: we need do we need to -> we need to
Jan 7, 2025
54f743b
Update exercises/108_labeled_switch.zig
Jan 8, 2025
90d0599
Update exercises/108_labeled_switch.zig
Jan 8, 2025
a47dfe1
Merge branch 'main' into main
Jan 8, 2025
b1fcca9
Merge pull request 'Update: 108 Labeled switch example to contain def…
Jan 8, 2025
fabedb4
Merge pull request 'Use print alias in exercise 100_for4.zig' (#198) …
Jan 9, 2025
3faad6e
Suggesting a third exercise for bit manipulation
alexandersisco Feb 3, 2025
657fd6a
changed the order of the sections to improve flow
alexandersisco Feb 4, 2025
0fa86eb
rearranged order of expected output in build.zig
alexandersisco Feb 4, 2025
502ac87
added newline between toggle and set sections to
alexandersisco Feb 4, 2025
4ac1d70
reset and completed exercise tracking wired in
zendril Feb 4, 2025
e54b30f
fmt
zendril Feb 4, 2025
8e6a52d
tracking, skipping and reset all wired in
zendril Feb 5, 2025
0903c59
cleanup for PR
zendril Feb 5, 2025
92c7235
cleanup for PR
zendril Feb 5, 2025
e09c11a
cleanup for PR
zendril Feb 5, 2025
a9487c2
cleanup for PR
zendril Feb 5, 2025
596d5e5
format fix
alexandersisco Feb 8, 2025
1478d41
added patch file for exercise 110
alexandersisco Feb 8, 2025
b38d700
Skip 74, the compiler corrects this now.
Feb 9, 2025
bfa0e62
Merge pull request 'Skip 74, the compiler corrects this now.' (#205) …
Feb 9, 2025
b3dd048
Merge pull request 'issue201-adding-progress-tracking' (#203) from ze…
Feb 9, 2025
c02e6ea
Added deletion of progress.txt for eowyn
Feb 9, 2025
c1777f4
Added delte_progress additional to the end of eowyn
Feb 9, 2025
c13a00f
Merge pull request 'Added deletion of progress.txt for eowyn' (#206) …
Feb 9, 2025
838fb4a
Merge branch 'main' into bit_man3
Feb 9, 2025
d75f49b
Fix repo link
Feb 10, 2025
0af4f75
Merge pull request 'Fix repo link' (#207) from readme into main
Feb 10, 2025
20596bc
converted 110 to a quiz (quiz 9)
alexandersisco Feb 11, 2025
a7cd808
moved explanatory content below the broken code in
alexandersisco Feb 11, 2025
465536b
made some simple changes to the wording to reflect
alexandersisco Feb 11, 2025
6fbf81d
edited the first two paragraphs
alexandersisco Feb 11, 2025
b7b3297
added blank lines between sections to make them
alexandersisco Feb 11, 2025
f7e8d4c
added header for quiz problems
alexandersisco Feb 11, 2025
2437edd
fixed incorrect bitmask in xor example
alexandersisco Feb 11, 2025
8384d4d
fixed minor spelling and grammar typos
alexandersisco Feb 12, 2025
90e90c9
fixed formatting
alexandersisco Feb 13, 2025
cd94f60
fixed spelling of 'bitmask'
Feb 13, 2025
064184c
Merge branch 'main' into bit_man3
Feb 13, 2025
0e0cafb
Merge pull request 'Suggesting a third exercise for bit manipulation'…
Feb 13, 2025
7382949
Shuttle weight fixed
Feb 14, 2025
f285bd5
Output from #60 adapted
Feb 14, 2025
2a9ef2d
Merge pull request 'Shuttle weight fixed' (#208) from e60 into main
Feb 14, 2025
bb986c0
fix: exercises/001_hello.zig (#1)
s-0-a-r Feb 3, 2024
9d21f82
fix: exercises/002_std.zig (#2)
s-0-a-r Feb 3, 2024
68d3ad4
Exercises/003 assignment (#3)
s-0-a-r Feb 3, 2024
8d77a3e
doc: add HOWTO_REBASE_ORIGINAL_REPO.md (#4)
s-0-a-r Feb 22, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
/zig-cache/
/.zig-cache/
/zig-out/
/answers/
/patches/healed/
/output/
.progress.txt

# Leave this in here for older zig versions
/zig-cache/
9 changes: 3 additions & 6 deletions .woodpecker/eowyn.yml → .woodpecker/eowyn.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
steps:
eowyn:
- name: eowyn
image: ziglings/ziglang:latest
pull: true
commands:
- sh ./patches/eowyn.sh
when:
events:
- push
- pull-requests
- cron
cron: "Daily"
event: [pull_request, push, cron]
cron: daily*
17 changes: 13 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ fit for one reason or another.

## Platforms and Zig Versions


Because it uses the Zig build system, Ziglings should work
wherever Zig does.

Expand All @@ -54,13 +55,12 @@ Ziglings. Please file an issue...or make a pull request!

## Formatting

All exercises should conform to `zig fmt`. I often forget to do
this.
All exercises should conform to `zig fmt`.


## Pull Request Workflow

Ziglings uses the "standard" Github workflow as guided by the Web
Ziglings uses the "standard" Codeberg workflow as guided by the Web
interface. Specifically:

* Fork this repository
Expand All @@ -71,11 +71,20 @@ interface. Specifically:
`git push origin my-branch`
* Create a pull request from your branch to `ziglings/main`
* Your faithful Ziglings maintainers will take a look at your
request ASAP (we don't talk about May-July 2022, LOL)
request ASAP (we don't talk about May-July, LOL)
* Once the changes are reviewed, your request will be merged and
eternal Ziglings contributor glory is yours!


## Licence

If you submit your contribution to the repository/project,
you agree that your contribution will be licensed under
the license of this repository/this project.
Please note, it does not change your rights to use your own
contribution for any other purpose.


## The Secrets

If you want to peek at the secrets, take a look at the `patches/`
Expand Down
40 changes: 40 additions & 0 deletions HOWTO_REBASE_ORIGINAL_REPO.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# How to rebase an original repository into this fork

## Clone the original repository and create a new rebased branch

```bash
# Clone the original repository
cd ../
git clone https://codeberg.org/ziglings/exercises.git
cd exercises

# Set the remote to your fork
git remote -v # should show origin https://codeberg.org/ziglings/exercises.git
git remote set-url origin https://github.com/s-0-a-r/ziglings-exercises.git
git remote -v # should show origin https://github.com/s-0-a-r/ziglings-exercises.git

# Create a new branch from the original branch
git switch -c original-branch

# Push the branch to your fork
git push -f origin original-branch

# Switch back to your branch
cd ../ziglings-exercises
git fetch
git switch -c rebase-original-branch

# Rebase the original branch into your branch
git rebase -i original-branch

# Push the rebased branch to your fork
git push -u origin rebase-original-branch
```

## Create a pull request

Please create a pull request from your rebased branch to main.

## Merge the pull request

After the pull request is merged, you can delete the branch from this fork.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021 Dave Gauer
Copyright (c) 2021 Dave Gauer, Chris Boesch

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
69 changes: 45 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
# Ziglings
# ⚠️ Ziglings has moved from GitHub to Codeberg!

You are looking at the current Ziglings repo if you are viewing
this at https://codeberg.org/ziglings/exercises/

You can also use the handy URL https://ziglings.org to get here!

***

Welcome to Ziglings! This project contains a series of tiny
broken programs (and one nasty surprise). By fixing them, you'll
Expand All @@ -18,11 +10,10 @@ Those broken programs need your help! (You'll also save the
planet from evil aliens and help some friendly elephants stick
together, which is very sweet of you.)

This project was directly inspired by the brilliant and fun
[rustlings](https://github.com/rust-lang/rustlings)
project for the [Rust](https://www.rust-lang.org/) language.
Indirect inspiration comes from [Ruby Koans](http://rubykoans.com/)
and the Little LISPer/Little Schemer series of books.
This project was initiated by [Dave Gauer](https://ratfactor.com/) and is directly inspired
by the brilliant and fun [rustlings](https://github.com/rust-lang/rustlings) project.
Indirect inspiration comes from [Ruby Koans](http://rubykoans.com/) and the Little LISPer/Little
Schemer series of books.

## Intended Audience

Expand Down Expand Up @@ -54,20 +45,20 @@ Verify the installation and build number of `zig` like so:

```
$ zig version
0.12.0-dev.xxxx+xxxxxxxxx
0.14.0-dev.xxxx+xxxxxxxxx
```

Clone this repository with Git:

```
$ git clone https://ziglings.org
$ cd ziglings.org
git clone https://codeberg.org/ziglings/exercises.git ziglings
cd ziglings
```

Then run `zig build` and follow the instructions to begin!

```
$ zig build
zig build
```

Note: The output of Ziglings is the unaltered output from the Zig
Expand All @@ -77,13 +68,13 @@ reading these.
## A Note About Versions

**Hint:** To check out Ziglings for a stable release of Zig, you can use
the appropriate tag.
the appropriate tag.

The Zig language is under very active development. In order to be
current, Ziglings tracks **development** builds of the Zig
compiler rather than versioned **release** builds. The last
stable release was `0.11.0`, but Ziglings needs a dev build with
pre-release version "0.12.0" and a build number at least as high
stable release was `0.13.0`, but Ziglings needs a dev build with
pre-release version "0.14.0" and a build number at least as high
as that shown in the example version check above.

It is likely that you'll download a build which is _greater_ than
Expand All @@ -96,9 +87,19 @@ that if you update one, you may need to also update the other.

### Version Changes

Version-0.12.0-dev.2043
* *2024-01-05* zig 0.12.0-dev.2043 - rename of `std.Build.FileSource` to `std.Build.LazyPath` - see[#16353](https://github.com/ziglang/zig/issues/16353)
* *2023-10-24* zig 0.12.0-dev.1243 - changes in `std.ChildProcess`: renamed exec to run - see[#5853](https://github.com/ziglang/zig/issues/5853)
Version-0.14.0-dev.1573
* *2024-09-16* zig 0.14.0-dev.1573 - introduction of labeled switch, see [#21257](https://github.com/ziglang/zig/pull/21257)
* *2024-09-02* zig 0.14.0-dev.1409 - several changes in std.builtin, see [#21225](https://github.com/ziglang/zig/pull/21225)
* *2024-08-04* zig 0.14.0-dev.1224 - several changes in build system, see [#21115](https://github.com/ziglang/zig/pull/21115)
* *2024-08-04* zig 0.14.0-dev.839 - several changes in build system, see [#20580](https://github.com/ziglang/zig/pull/20580), [#20600](https://github.com/ziglang/zig/issues/20600)
* *2024-06-17* zig 0.14.0-dev.42 - changes in `std.mem.split and tokenize` - see [#15579](https://github.com/ziglang/zig/pull/15579)
* *2024-05-29* zig 0.13.0-dev.339 - rework std.Progress - see [#20059](https://github.com/ziglang/zig/pull/20059)
* *2024-03-21* zig 0.12.0-dev.3518 - change to @fieldParentPtr - see [#19470](https://github.com/ziglang/zig/pull/19470)
* *2024-03-21* zig 0.12.0-dev.3397 - rename std.os to std.posix - see [#5019](https://github.com/ziglang/zig/issues/5019)
* *2024-03-14* zig 0.12.0-dev.3302 - changes in `std.fmt` - floating-point formatting implementation - see [#19229](https://github.com/ziglang/zig/pull/19229)
* *2024-02-05* zig 0.12.0-dev.2618 - changes in `build system` - from `Step.zig_exe` to `Step.graph.zig_exe` - see [#18778](https://github.com/ziglang/zig/issues/18778)
* *2024-01-05* zig 0.12.0-dev.2043 - rename of `std.Build.FileSource` to `std.Build.LazyPath` - see [#16353](https://github.com/ziglang/zig/issues/16353)
* *2023-10-24* zig 0.12.0-dev.1243 - changes in `std.ChildProcess`: renamed exec to run - see [#5853](https://github.com/ziglang/zig/issues/5853)
* *2023-06-26* zig 0.11.0-dev.4246 - changes in compile step (now it can be null)
* *2023-06-26* zig 0.11.0-dev.3853 - removal of destination type from all cast builtins
* *2023-06-20* zig 0.11.0-dev.3747 - `@enumToInt` is now `@intFromEnum` and `@intToFloat` is now `@floatFromInt`
Expand Down Expand Up @@ -129,6 +130,18 @@ It can be handy to check just a single exercise:
zig build -Dn=19
```

Or run all exercises, starting from a specific one:

```
zig build -Ds=27
```

Or let Ziglings pick an exercise for you:

```
zig build -Drandom
```

You can also run without checking for correctness:

```
Expand Down Expand Up @@ -160,6 +173,11 @@ zig build -Dn=19 -l
...
```

To reset the progress (have it run all the exercises that have already been completed):
```
zig build -Dreset
```

## What's Covered

The primary goal for Ziglings is to cover the core Zig language.
Expand Down Expand Up @@ -215,13 +233,16 @@ Zig Core Language
* [X] Interfaces
* [X] Bit manipulation
* [X] Working with C
* [ ] Interfaces part 2
* [X] Threading
* [x] Labeled switch
* [x] Vector operations (SIMD)

Zig Standard Library

* [X] String formatting
* [X] Testing
* [X] Tokenization
* [X] File handling

## Contributing

Expand Down
Loading