Great Fork Merge #24
Merged
Great Fork Merge #24
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is because the mkiocccentry repo has offending markdown files. Hopefully this resolves the workflow problem with find-invalid-json.sh script and rule added to make test.
Hopefully this solves the problem.
Q: What do you call the time when a person tries to fix something when they only have a minute? A: Rush minute! Anyway hopefully this is the final typo fixed needed. If not I have more time now, however, so the problem can be remedied.
It seems that the problem was (or perhaps not .. we'll see :-) ) is that the 'run:' part of each task in the workflow file should not have a '-'. If this is the case then this should solve the problem and if so the problem was that some had it and others had it and in a rush I thought, forgetting the syntax, that the problem was the missing ones were incorrect.
This code is based on a 'fix' that causes another issue, and could potentially be 'wrong' to have. It is better, I think, to pose the challenge to the viewer to see if they can solve the problem themselves, and if so if there are any issues with such a fix.
Update test.yml workflow for find-invalid-json.sh
Remove 2012/kang alt code
We convert it to use the canonical yyyy.dir form.
Format fixes in html files of 2013
The `bin/entry2csv.sh` too was modified to leave \uxxxx in awards alone and to NOT convert it. Changed `bin/entry2csv.sh` VERSION from "1.5.1 2024-10-10" to "1.6 2024-10-14". Performed `make entry2csv` and `make csv2entry` to test the above under macOS.
This commit also adds the faq.html and bugs.html file that should have been committed with 2013. The reason the faq.md is updated with only the version update (backdated to yesterday) is because the version was not updated with the previous update.
The code 5 was missing. The reason other lines changed is simply formatting (aligned to 4 chars).
Format fixes in html files of 2014
Fix exit code text in bin/find-missing-links.sh
Format fix html files in 2015, update bugs file
The to use should refer to a file, not some text.
1985/sicherman now has an abstract of: rot13 w/strange #defines that create comment headers etc. I note that this is longer than what I believe was what was desired. However it is the same length as it was before, only that it now has #defines instead of #defs. 1988/phillipps has: 12 Days of Christmas recursive main() calls w/tables instead of 'days of christmas heavily main() calling with tables'. The rewording was necessary to keep the length the same but to be more clear. I just remembered however, that to fix it for modern systems, a new function had to be added which is the recursive function, so it no longer is strictly true that it it is recursive main() calls. It might be better to keep it main(), however, as that was the original award. The difference here is that it is now a bit more correct in the output.
Typo/format fixes were made in next/pw-change.html, next/register.html, next/submit.html. The screenshot for register step 6 (welcome email) was updated to reflect a typo I had reported (after it was fixed). The html file still has to be checked for rendering and that will be done soon.
Fix in 2018/ciura/index.html
Update/improve two entries' abstracts
Fixes and updates in next/
Various fixes and updates to FAQ
Make lines beginning (in markdown files) 'BTW' bold. Rebuilt the respective html pages. Slight update to abstract in two entries (1985/shapiro and 1994/shapiro). One is changing 'defines' to '#defines' and the other was a typo fix. Fixed make gen_next: added missing new files. Various fixes in next/register.html (typos and other things).
Various fixes and updates
Some broken links were fixed in some of the files like next/index.html, next/pw-change.html, next/index.html and status.html. Some wrong images were used in next/submit.html (or at least referred to wrong if not wrong image). Useful update to FAQ about the answers file in mkiocccentry. There might have been other things. This might be all that is needed for next/ wrt the register/change password/submit but it's possible something has slipped through.
Various fixes in next and top level directory
The menu in all html pages for the FAQ was fixed to link to the step 0
(of how to enter the contest) and also it was renamed ('Enter the
IOCCC').
I also went through the most important sections of the FAQ (how to
enter and the mkiocccentry related questions) and checked the
register.html, pw-change.html and submit.html pages. It is possible I
have missed something but I think it's in pretty good shape nonetheless.
Fix menu and various other fixes
We intend to hole IOCCC28 in order to populate a new 2024 directory with amazing winning IOCCC entries! :-)
It turned out that `next/rules.md` was modified in the section marked
between:
```html
<!-- START: this line starts content from: inc/rules.closed.hdr -->
```
and:
```html
<!-- END: the next line ends content from: inc/rules.closed.hdr -->
```
Instead, `inc/{guidelines,rules}.*.hdr` should be modified as
`make gen_status` uses these files to form this content.
As per the TODO: - [ ] Verify the markdown code blocks are properly indented ```sh find . -name '*.md' ! -name markdown.md -print0 | xargs -0 pcregrep -M '^``.*\n[^|`\n \t]' ``` Fixed `1998/dorssel/dorssel.md` and `thanks-for-help.md`. Performed `make quick_www` to process the above.
We set dates and times for when IOCCC28 will go into pending state, open state, and judging state. These dates are subject to change until the content enters the open state. Modified both `next/guidelines.md` and `next/rules.md` as per the IOCCC28 dates and times. Improve the `next/guidelines.md` and `next/rules.md` text around IOCCC28 dates and times. We processed the XXX's in markdown files that needed processing. Fixed a minor typo in `bin/cvt-submission.sh`. Made some minor formatting improvements to `faq.md`, `next/register.md`, `next/rules.md`, `next/guidelines.md`, `README.md` and `index.md`. Updated "Rule 3" in `next/rules.md` in regards to the above. Updated "Rule 8" in `next/rules.md` in regards to the above. Changed `faq.md` version from **28.1.8 2024-12-07** to **28.2.0 2024-12-28**. Changed `next/guidelines.md` version from **28.29 2024-12-27** to **28.30 2024-12-28**. Changed `next/rules.md` version from **28.14 2024-12-07** to **28.15 2024-12-28**. TODO: Review these changes.
In preparation for the **Great Fork Merge**: We change references for the repo from `https://github.com/ioccc-src/temp-test-ioccc` to `https://github.com/ioccc-src/winner`. We change references for the web site from `https://ioccc-src.github.io/temp-test-ioccc` to `https://github.com/ioccc-src/winner`. NOTE: There will be a **LOT OF LINKS BROKEN**, because of the changes to the REPO URL and the WEBSITE URL, until the **Great Fork Merge** updates the+[official IOCCC website](https://www.ioccc.org).
Announce the result of the **Great Fork Merge** and the IOCCC28 dates!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Great Fork Merge of 2024!