From 75907222cde42ad67881de596631466c675dd33f Mon Sep 17 00:00:00 2001 From: Forest Anderson Date: Tue, 9 Apr 2024 08:44:56 -0400 Subject: [PATCH 1/4] General action fixes --- .github/newsletter-issue-template.md | 32 ++++++++---------------- .github/newsletter-template.md | 4 +-- .github/workflows/create-newsletter.yaml | 3 ++- 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/.github/newsletter-issue-template.md b/.github/newsletter-issue-template.md index 7f670d7ef..a35d7a909 100644 --- a/.github/newsletter-issue-template.md +++ b/.github/newsletter-issue-template.md @@ -13,19 +13,15 @@ newsletter with {{ env.NEWSLETTER_MONTH }}'s news! ## Current Schedule -The deadline for all section PRs is the **03.{{ env.NEWSLETTER_DEADLINE }}** +The deadline for all section PRs is the **3rd of {{ env.NEWSLETTER_MONTH_NAME}}, {{ env.NEWSLETTER_YEAR }}** -We _may_ still accept PRs that are submitted later than this, as long as they're -ready before the newsletter's release, but this isn't guaranteed. -If you want your section to be included, don't leave it till the last minute! +We _may_ still accept PRs that are submitted later than this, as long as they're ready before the newsletter's release, but this isn't guaranteed. If you want your section to be included, don't leave it till the last minute! ## Current Structure & Status -Below is our current planned structure for the newsletter, -and the status of each PR (which we'll try to keep updated). +Below is our current planned structure for the newsletter, and the status of each PR (which we'll try to keep updated). -This is **not** an exhaustive list - if you have your own project that you want -to write about, just make a comment on this issue and open a PR! +This is **not** an exhaustive list - if you have your own project that you want to write about, just make a comment on this issue and open a PR! ### Game Updates @@ -68,20 +64,12 @@ to write about, just make a comment on this issue and open a PR! If you want to help writing the newsletter: - **Read [CONTRIBUTING.md](https://github.com/rust-gamedev/rust-gamedev.github.io/blob/source/CONTRIBUTING.md?rgh-link-date=2023-09-12T16%3A17%3A34Z).** -- Choose one or more of the "🆓 **free**" sections listed below, and leave a -comment letting us know you want to work on them. - - The links in brackets (like `[1](#), [2](#), [3](#)`) are suggestions of - links to include in the section. Feel free to add more! - - The username listed next to the section (like `@janhohenheim?`) is a - suggestion of who may want to pick up the work (usually the project's - developer, or someone who has expressed interest in the past). - - You are not obligated to write a section if you're tagged or your project - is listed! You're welcome to ask someone else to write the section, - or to ask for your project to be excluded from this month's post. - - Extra sections not listed in the plan are welcomed - - just leave a comment and open a PR! -- Write a short overview in the newsletter's Markdown file, -making sure to follow the style guidelines (see below). +- Choose one or more of the "🆓 **free**" sections listed below, and leave a comment letting us know you want to work on them. + - The links in brackets (like `[1](#), [2](#), [3](#)`) are suggestions of links to include in the section. Feel free to add more! + - The username listed next to the section (like `@janhohenheim?`) is a suggestion of who may want to pick up the work (usually the project's developer, or someone who has expressed interest in the past). + - You are not obligated to write a section if you're tagged or your project is listed! You're welcome to ask someone else to write the section, or to ask for your project to be excluded from this month's post. + - Extra sections not listed in the plan are welcomed - just leave a comment and open a PR! +- Write a short overview in the newsletter's Markdown file, making sure to follow the style guidelines (see below). - Send a PR _to the `source` branch_ (example: [N15: A/B Street #336](https://github.com/rust-gamedev/rust-gamedev.github.io/pull/336)). - Mention this issue in your PR's description to link it all together. diff --git a/.github/newsletter-template.md b/.github/newsletter-template.md index e6f93c37a..37fe3059b 100644 --- a/.github/newsletter-template.md +++ b/.github/newsletter-template.md @@ -1,7 +1,7 @@ +++ title = "This Month in Rust GameDev #{{ NEWSLETTER_COUNTER }} - {{ NEWSLETTER_MONTH }} {{ NEWSLETTER_YEAR }}" transparent = true -date = {{ NEWSLETTER_DEADLINE }} +date = {{ NEWSLETTER_YEAR }}-{{ NEWSLETTER_MONTH }}-03 draft = true +++ @@ -35,8 +35,8 @@ Feel free to send PRs about your own projects! - [Learning Material Updates](#learning-material-updates) - [Tooling Updates](#tooling-updates) - [Library Updates](#library-updates) -- [Other News](#other-news) - [Popular Workgroup Issues in GitHub](#popular-workgroup-issues-in-github) +- [Other News](#other-news) - [Meeting Minutes](#meeting-minutes) - [Discussions](#discussions) - [Requests for Contribution](#requests-for-contribution) diff --git a/.github/workflows/create-newsletter.yaml b/.github/workflows/create-newsletter.yaml index 192fb6850..a97f5f17b 100644 --- a/.github/workflows/create-newsletter.yaml +++ b/.github/workflows/create-newsletter.yaml @@ -18,10 +18,11 @@ jobs: - name: Set environment variables run: | echo "NEWSLETTER_MONTH=$(date +'%B')" >> $GITHUB_ENV + echo "NEWSLETTER_MONTH_NAME=$(date +'%b')" >> $GITHUB_ENV echo "NEWSLETTER_YEAR=$(date +'%Y')" >> $GITHUB_ENV echo "NEWSLETTER_DEADLINE=$(date -d' 1 month ' '+%m.%Y')" >> $GITHUB_ENV # take the amount of months since feb 2024 and add 50 - echo "NEWSLETTER_COUNTER=$(( ( ( $(date +'%Y') - 2024 ) * 12 + $(date +'%m') - 2 ) + 50 ))" >> $GITHUB_ENV + echo "NEWSLETTER_COUNTER=$(( ( ( $(date +'%Y') - 2024 ) * 12 + $(date +'%m') - 4 ) + 50 ))" >> $GITHUB_ENV - name: Create newsletter scaffold run: ./.github/create_newsletter_scaffold.sh - name: Commit and create pull request From 0f99dd588cfb3cadb09b8c36f7e305f782d9da94 Mon Sep 17 00:00:00 2001 From: Forest Anderson Date: Tue, 9 Apr 2024 09:00:43 -0400 Subject: [PATCH 2/4] Fix dates --- .github/create_newsletter_scaffold.sh | 6 ------ .github/newsletter-issue-template.md | 12 ++++++------ .github/newsletter-template.md | 4 ++-- .github/workflows/create-newsletter.yaml | 11 +++++------ 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/.github/create_newsletter_scaffold.sh b/.github/create_newsletter_scaffold.sh index 40fa434a7..5c99f0d54 100755 --- a/.github/create_newsletter_scaffold.sh +++ b/.github/create_newsletter_scaffold.sh @@ -12,11 +12,6 @@ if [[ -z "${NEWSLETTER_YEAR}" ]]; then exit 1 fi -if [[ -z "${NEWSLETTER_DEADLINE}" ]]; then - echo "NEWSLETTER_DEADLINE is not set. Exiting..." - exit 1 -fi - if [[ -z "${NEWSLETTER_COUNTER}" ]]; then echo "NEWSLETTER_COUNTER is not set. Exiting..." exit 1 @@ -25,7 +20,6 @@ fi cp .github/newsletter-template.md index.md sed -i "s/{{\s*NEWSLETTER_MONTH\s*}}/${NEWSLETTER_MONTH}/g" index.md sed -i "s/{{\s*NEWSLETTER_YEAR\s*}}/${NEWSLETTER_YEAR}/g" index.md -sed -i "s/{{\s*NEWSLETTER_DEADLINE\s*}}/${NEWSLETTER_DEADLINE}/g" index.md sed -i "s/{{\s*NEWSLETTER_COUNTER\s*}}/${NEWSLETTER_COUNTER}/g" index.md # Create a dir in content/news with the counter with 3 digits as name destination="content/news/$(printf "%03d" ${NEWSLETTER_COUNTER})" diff --git a/.github/newsletter-issue-template.md b/.github/newsletter-issue-template.md index a35d7a909..d4aef3292 100644 --- a/.github/newsletter-issue-template.md +++ b/.github/newsletter-issue-template.md @@ -13,7 +13,7 @@ newsletter with {{ env.NEWSLETTER_MONTH }}'s news! ## Current Schedule -The deadline for all section PRs is the **3rd of {{ env.NEWSLETTER_MONTH_NAME}}, {{ env.NEWSLETTER_YEAR }}** +The deadline for all section PRs is the **3rd of {{ env.NEWSLETTER_NEXT_MONTH}}, {{ env.NEWSLETTER_YEAR }}** We _may_ still accept PRs that are submitted later than this, as long as they're ready before the newsletter's release, but this isn't guaranteed. If you want your section to be included, don't leave it till the last minute! @@ -53,11 +53,11 @@ This is **not** an exhaustive list - if you have your own project that you want ## Publishing Steps -- [ ] Final review - by everyone -- [ ] Publish - by @janhohenheim -- [ ] Post on /r/rust, /r/rust_gamedev, /r/gamedev, URLO - by @janhohenheim -- [ ] Pin thread on Twitter - by @AngelOnFira -- [ ] Add comment links - by @AngelOnFira +- [ ] Final review - by everyone +- [ ] Publish - by @janhohenheim +- [ ] Post on /r/rust, /r/rust_gamedev, /r/gamedev, URLO - by @janhohenheim +- [ ] Pin thread on Twitter - by @AngelOnFira +- [ ] Add comment links - by @AngelOnFira ## How to Contribute diff --git a/.github/newsletter-template.md b/.github/newsletter-template.md index 37fe3059b..8ad42d695 100644 --- a/.github/newsletter-template.md +++ b/.github/newsletter-template.md @@ -1,7 +1,7 @@ +++ title = "This Month in Rust GameDev #{{ NEWSLETTER_COUNTER }} - {{ NEWSLETTER_MONTH }} {{ NEWSLETTER_YEAR }}" transparent = true -date = {{ NEWSLETTER_YEAR }}-{{ NEWSLETTER_MONTH }}-03 +date = {{ NEWSLETTER_YEAR }}-{{ NEWSLETTER_NEXT_MONTH }}-03 draft = true +++ @@ -112,7 +112,7 @@ useful information --> ------- +--- That's all news for today, thanks for reading! diff --git a/.github/workflows/create-newsletter.yaml b/.github/workflows/create-newsletter.yaml index a97f5f17b..b80dfddd6 100644 --- a/.github/workflows/create-newsletter.yaml +++ b/.github/workflows/create-newsletter.yaml @@ -7,7 +7,7 @@ on: inputs: {} permissions: contents: write - issues: write + issues: write jobs: create-newsletter: runs-on: ubuntu-latest @@ -18,9 +18,8 @@ jobs: - name: Set environment variables run: | echo "NEWSLETTER_MONTH=$(date +'%B')" >> $GITHUB_ENV - echo "NEWSLETTER_MONTH_NAME=$(date +'%b')" >> $GITHUB_ENV + echo "NEWSLETTER_NEXT_MONTH=$(date -d' 1 month ' +'%B')" >> $GITHUB_ENV echo "NEWSLETTER_YEAR=$(date +'%Y')" >> $GITHUB_ENV - echo "NEWSLETTER_DEADLINE=$(date -d' 1 month ' '+%m.%Y')" >> $GITHUB_ENV # take the amount of months since feb 2024 and add 50 echo "NEWSLETTER_COUNTER=$(( ( ( $(date +'%Y') - 2024 ) * 12 + $(date +'%m') - 4 ) + 50 ))" >> $GITHUB_ENV - name: Create newsletter scaffold @@ -33,9 +32,9 @@ jobs: title: "Newsletter N${{ env.NEWSLETTER_COUNTER }} for ${{ env.NEWSLETTER_MONTH }} ${{ env.NEWSLETTER_YEAR }}" body: "This PR adds the initial newsletter source file for ${{ env.NEWSLETTER_MONTH }} ${{ env.NEWSLETTER_YEAR }}." assignees: | - AngelOnFira - janhohenheim - mamaicode + AngelOnFira + janhohenheim + mamaicode - name: Create tracking issue uses: JasonEtco/create-an-issue@v2 env: From f88b12445804d3c01485ce634a84eea75c597b09 Mon Sep 17 00:00:00 2001 From: Forest Anderson Date: Tue, 9 Apr 2024 09:03:12 -0400 Subject: [PATCH 3/4] Fix separator --- .github/newsletter-template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/newsletter-template.md b/.github/newsletter-template.md index 8ad42d695..344cc8c03 100644 --- a/.github/newsletter-template.md +++ b/.github/newsletter-template.md @@ -112,7 +112,7 @@ useful information --> ---- +------ That's all news for today, thanks for reading! From 9ff7aed4f03a92f92c0bcf60eb401be4b23dd80f Mon Sep 17 00:00:00 2001 From: Forest Anderson Date: Tue, 9 Apr 2024 09:07:45 -0400 Subject: [PATCH 4/4] Fix post date --- .github/newsletter-template.md | 2 +- .github/workflows/create-newsletter.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/newsletter-template.md b/.github/newsletter-template.md index 344cc8c03..748f43029 100644 --- a/.github/newsletter-template.md +++ b/.github/newsletter-template.md @@ -1,7 +1,7 @@ +++ title = "This Month in Rust GameDev #{{ NEWSLETTER_COUNTER }} - {{ NEWSLETTER_MONTH }} {{ NEWSLETTER_YEAR }}" transparent = true -date = {{ NEWSLETTER_YEAR }}-{{ NEWSLETTER_NEXT_MONTH }}-03 +date = {{ NEWSLETTER_YEAR }}-{{ NEWSLETTER_NEXT_MONTH_NUMBER }}-03 draft = true +++ diff --git a/.github/workflows/create-newsletter.yaml b/.github/workflows/create-newsletter.yaml index b80dfddd6..b92b3e6b1 100644 --- a/.github/workflows/create-newsletter.yaml +++ b/.github/workflows/create-newsletter.yaml @@ -19,6 +19,7 @@ jobs: run: | echo "NEWSLETTER_MONTH=$(date +'%B')" >> $GITHUB_ENV echo "NEWSLETTER_NEXT_MONTH=$(date -d' 1 month ' +'%B')" >> $GITHUB_ENV + echo "NEWSLETTER_NEXT_MONTH_NUMBER=$(date -d' 1 month ' +'%m')" >> $GITHUB_ENV echo "NEWSLETTER_YEAR=$(date +'%Y')" >> $GITHUB_ENV # take the amount of months since feb 2024 and add 50 echo "NEWSLETTER_COUNTER=$(( ( ( $(date +'%Y') - 2024 ) * 12 + $(date +'%m') - 4 ) + 50 ))" >> $GITHUB_ENV