Skip to content

Commit aeb2ae6

Browse files
authored
Merge branch 'rust-gamedev:main' into source
2 parents 43caf2d + 325de3f commit aeb2ae6

File tree

129 files changed

+4587
-1079
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+4587
-1079
lines changed

.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[*.{md,mkdn}]
2+
trim_trailing_whitespace = false
3+
indent_style = space

.github/create_newsletter_scaffold.sh

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ cp .github/newsletter-template.md index.md
2727
sed -i "s/{{\s*NEWSLETTER_MONTH\s*}}/${NEWSLETTER_MONTH}/g" index.md
2828
sed -i "s/{{\s*NEWSLETTER_YEAR\s*}}/${NEWSLETTER_YEAR}/g" index.md
2929
sed -i "s/{{\s*NEWSLETTER_COUNTER\s*}}/${NEWSLETTER_COUNTER}/g" index.md
30+
sed -i "s/{{\s*NEWSLETTER_COUNTER_NEXT\s*}}/$((NEWSLETTER_COUNTER + 1))/g" index.md
3031
sed -i "s/{{\s*NEWSLETTER_NEXT_MONTH_NUMBER\s*}}/${NEWSLETTER_NEXT_MONTH_NUMBER}/g" index.md
3132
# Create a dir in content/news with the counter with 3 digits as name
3233
destination="content/news/$(printf "%03d" ${NEWSLETTER_COUNTER})"

.github/newsletter-issue-template.md

+25-5
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ but here are the most important rules:
102102
- Only one image per section is allowed.
103103
- The maximum size is 300kb for static images and 2.5mb for GIFs.
104104
- The image should come before the text, and must have alt text for accessibility.
105-
- Prefer static images to GIFs, to keep the page load times down.
105+
- Prefer static images to GIFs/videos, to keep the page load times down.
106+
- To include a video, encode it as `H.264` in an `mp4` container and use
107+
the `video_figure()` shortcode; videos autoplay in a loop (muted).
106108
- Each section should be under 1000 characters, and under 6 paragraphs.
107109
- This only applies to the rendered text, not the markup.
108110
- Keep formatting minimal - no bold/italics/etc.
@@ -115,8 +117,17 @@ Please use these templates as a starting point:
115117
```md
116118
### [Game name]
117119

118-
![alt text](img)
119-
_optional image label_
120+
{{ image_figure(
121+
alt="image/GIF description",
122+
src="image link",
123+
caption="image caption") }}
124+
125+
OR
126+
127+
{{ video_figure(
128+
type="video/mp4",
129+
src="my-video.mp4",
130+
caption="optional video caption") }}
120131

121132
[Game name] ([GitHub], [Discord], [Twitter]) by [@nickname]
122133
is... {short project description in one sentence}.
@@ -133,8 +144,17 @@ _Discussions: [/r/rust_gamedev](link), [Twitter](link), [etc](link)_
133144
```md
134145
### [Article name]
135146

136-
![alt text](img)
137-
_optional image label_
147+
{{ image_figure(
148+
alt="image/GIF description",
149+
src="image link",
150+
caption="image caption") }}
151+
152+
OR
153+
154+
{{ video_figure(
155+
type="video/mp4",
156+
src="my-video.mp4",
157+
caption="optional video caption") }}
138158

139159
[@nickname] published an [article] about...
140160
{overview what the resource is about}.

.github/newsletter-template.md

+26-5
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,25 @@ Feel free to send PRs about your own projects!
4242
- [Requests for Contribution](#requests-for-contribution)
4343
- [Jobs](#jobs)
4444
- [Bonus](#bonus)
45+
- [Future news](#future-news)
4546

4647
<!--
4748
Ideal section structure is:
4849
4950
```
5051
### [Title]
5152
52-
![image/GIF description](image link)
53-
_image caption_
53+
{{ image_figure(
54+
alt="image/GIF description",
55+
src="image link",
56+
caption="image caption") }}
57+
58+
OR
59+
60+
{{ video_figure(
61+
type="video/mp4",
62+
src="my-video.mp4",
63+
caption="optional video caption") }}
5464
5565
A paragraph or two with a summary and [useful links].
5666
@@ -112,13 +122,24 @@ useful information -->
112122
<!-- Bonus section to make the newsletter more interesting
113123
and highlight events from the past. -->
114124

125+
## Future news
126+
127+
<!-- Section to get more people involved in writing news. -->
128+
129+
Editing this newsletter wouldn't be possible without [your contributions][news_current_prs].
130+
Thanks to everyone who helped us this month!
131+
132+
If you want something mentioned in the next newsletter, [send us a pull request][pr].
133+
134+
You can also get an early look at pending issues for the [next newsletter][news_future_prs].
135+
136+
[news_current_prs]: https://github.com/rust-gamedev/rust-gamedev.github.io/pulls?q=is%3Apr+in%3Atitle+%27N{{ NEWSLETTER_COUNTER }}%27
137+
[news_future_prs]: https://github.com/rust-gamedev/rust-gamedev.github.io/pulls?q=is%3Apr+in%3Atitle+%27N{{ NEWSLETTER_COUNTER_NEXT }}%27
138+
115139
------
116140

117141
That's all news for today, thanks for reading!
118142

119-
Want something mentioned in the next newsletter?
120-
[Send us a pull request][pr].
121-
122143
Also, subscribe to our socials if you want to receive fresh news!
123144
- X/Twitter: [@rust_gamedev][@x_rust_gamedev]
124145
- Mastodon: [@rust_gamedev][@mastodon_rust_gamedev]

.github/workflows/ci.yml

+42-19
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,35 @@ jobs:
1010
runs-on: ubuntu-latest
1111
env:
1212
BASE_URL: https://github.com/getzola/zola/releases/download
13-
VERS: v0.15.2
13+
VERS: v0.19.1
1414
ARCH: x86_64-unknown-linux-gnu
1515
# https://github.com/crazy-max/ghaction-github-pages/issues/1#issuecomment-623202206
1616
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1717
steps:
18+
- uses: actions/checkout@v4
19+
- name: Lint
20+
uses: avto-dev/markdown-lint@v1
21+
with:
22+
args: '.'
23+
config: '.markdownlint.json'
24+
- name: Install Zola
25+
run: |
26+
curl -L ${BASE_URL}/${VERS}/zola-${VERS}-${ARCH}.tar.gz | tar -xz
27+
echo "Zola version: $(./zola --version)"
28+
- name: Zola build
29+
run: ./zola build
30+
- name: Upload GitHub Pages artifact
31+
uses: actions/upload-pages-artifact@v3
32+
with:
33+
path: public
34+
35+
links:
36+
name: Check for Broken Links
37+
runs-on: ubuntu-latest
38+
steps:
1839
- uses: actions/checkout@v4
1940
with:
20-
fetch-depth: ${{ github.event_name == 'pull_request' && 2 || 0 }}
41+
fetch-depth: ${{ github.event_name == 'pull_request' && 2 || 0 }}
2142
- name: Get changed files
2243
id: changed-files
2344
# source: https://stackoverflow.com/a/74268200, added filtering for markdown files
@@ -29,11 +50,6 @@ jobs:
2950
fi
3051
echo "changed_files: $changed_files"
3152
echo "changed_files=$changed_files" >> $GITHUB_OUTPUT
32-
- name: Lint
33-
uses: avto-dev/markdown-lint@v1
34-
with:
35-
args: '.'
36-
config: '.markdownlint.json'
3753
- name: Check links
3854
uses: lycheeverse/[email protected]
3955
if: ${{ steps.changed-files.outputs.changed_files != '' }}
@@ -45,16 +61,23 @@ jobs:
4561
--accept '100..=103,200..=299,300..=399'
4662
--exclude '[^\w]todo[^\w]?'
4763
--exclude 'https://(www\.|old\.)?reddit\.com'
64+
--exclude 'https://www.patreon.com'
65+
--exclude 'https://gamedev.social'
66+
--exclude 'dev.epicgames.com'
67+
--exclude-path 'assets/logo/readme.md'
4868
${{ steps.changed-files.outputs.changed_files }}
49-
- name: Install Zola
50-
run: |
51-
curl -L ${BASE_URL}/${VERS}/zola-${VERS}-${ARCH}.tar.gz | tar -xz
52-
echo "Zola version: $(./zola --version)"
53-
- name: Zola build
54-
run: ./zola build
55-
- name: Deploy
56-
if: github.ref == 'refs/heads/source'
57-
uses: crazy-max/ghaction-github-pages@v1
58-
with:
59-
build_dir: public
60-
target_branch: master
69+
70+
pages:
71+
needs: zola
72+
permissions:
73+
pages: write
74+
id-token: write
75+
environment:
76+
name: github-pages
77+
url: ${{ steps.deployment.outputs.page_url }}
78+
runs-on: ubuntu-latest
79+
if: format('refs/heads/{0}', github.event.repository.default_branch) == github.ref
80+
steps:
81+
- name: Deploy to GitHub Pages
82+
id: deployment
83+
uses: actions/deploy-pages@v4

.markdownlint.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,11 @@
1111
"no-hard-tabs": false,
1212
"hr-style": false,
1313
"strong-style": false,
14-
"emphasis-style": false
14+
"no-bare-urls": false,
15+
"emphasis-style": false,
16+
"no-inline-html": {
17+
"allowed_elements": [
18+
"abbr"
19+
]
20+
}
1521
}

CONTRIBUTING.md

+33-10
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22

33
Thank you for contributing to the newsletter! 💖
44

5-
- [Writing Newsletter Sections](#writing-newsletter-sections)
6-
- [Templates](#templates)
7-
- [Style Guidelines](#style-guidelines)
8-
- [Becoming an Editor](#becoming-an-editor)
5+
- [Contributing Guide](#contributing-guide)
6+
- [Writing Newsletter Sections](#writing-newsletter-sections)
7+
- [Templates](#templates)
8+
- [Games, Apps or Libraries](#games-apps-or-libraries)
9+
- [Articles, Blog Posts or Videos](#articles-blog-posts-or-videos)
10+
- [Style Guidelines](#style-guidelines)
11+
- [Becoming an Editor](#becoming-an-editor)
912

1013
## Writing Newsletter Sections
1114

@@ -53,8 +56,17 @@ your GitHub notifications for any further review comments from the editors.
5356
```md
5457
### [Game name]
5558

56-
![alt text](img)
57-
_optional image label_
59+
{{ image_figure(
60+
alt="image/GIF description",
61+
src="image link",
62+
caption="image caption") }}
63+
64+
OR
65+
66+
{{ video_figure(
67+
type="video/mp4",
68+
src="my-video.mp4",
69+
caption="optional video caption") }}
5870

5971
[Game name] ([GitHub], [Discord], [Twitter]) by [@nickname]
6072
is... {short project description in one sentence}.
@@ -71,8 +83,17 @@ _Discussions: [/r/rust_gamedev](link), [Twitter](link), [etc](link)_
7183
```md
7284
### [Article name]
7385

74-
![alt text](img)
75-
_optional image label_
86+
{{ image_figure(
87+
alt="image/GIF description",
88+
src="image link",
89+
caption="image caption") }}
90+
91+
OR
92+
93+
{{ video_figure(
94+
type="video/mp4",
95+
src="my-video.mp4",
96+
caption="optional video caption") }}
7697

7798
[@nickname] published an [article] about...
7899
{overview what the resource is about}.
@@ -96,11 +117,13 @@ _Discussions: [/r/rust_gamedev](link), [Twitter](link), [etc](link)_
96117
- Avoid having multiple/nested bullet points.
97118
- This guideline may be relaxed if your project has multiple parts that
98119
aren't independent enough for their own sections.
99-
- Only include one image (<300kb) or GIF (<2.5mb).
120+
- Only include one image (<300kb), GIF (<2.5mb) or video (<2.5mb).
100121
- Images should be placed before text, with an optional caption and
101122
mandatory alternate text for accessibility.
102123
- Unless essential to demonstrating your project, prefer static images
103-
over GIFs, to keep the file size down.
124+
over GIFs/videos, to keep the file size down.
125+
- To include a video, encode it as `H.264` in an `mp4` container and use
126+
the `video_figure()` shortcode; videos autoplay in a loop (muted).
104127
- Use singular 'they' if you’re not sure what someone's pronouns are.
105128
- If a project has been featured in previous newsletters, try to focus on
106129
what's new rather than repeating previous content.

0 commit comments

Comments
 (0)