Skip to content

Commit a1b3a53

Browse files
authored
Merge branch 'main' into idiomatic/typesystem-borrowchecker
2 parents fc3f3de + a5e6897 commit a1b3a53

Some content is hidden

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

54 files changed

+1694
-261
lines changed

.github/workflows/apt-get-install/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ runs:
4141
- name: Installing ${{ inputs.packages }}
4242
shell: bash
4343
run: |
44-
sudo apt-get install --quiet --yes ${{ inputs.packages }}
44+
sudo apt-get install --quiet --yes --no-install-recommends ${{ inputs.packages }}

.github/workflows/build.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ export MDBOOK_OUTPUT__PANDOC__DISABLED=false
4343

4444
mdbook build -d "$dest_dir"
4545

46-
# Disable the redbox button in built versions of the course
47-
echo '// Disabled in published builds, see build.sh' > "${dest_dir}/html/theme/redbox.js"
48-
4946
mv "$dest_dir/pandoc/pdf/comprehensive-rust.pdf" "$dest_dir/html/"
5047
(cd "$dest_dir/exerciser" && zip --recurse-paths ../html/comprehensive-rust-exercises.zip comprehensive-rust-exercises/)
5148

.github/workflows/build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: Test
2+
permissions:
3+
contents: read
24

35
on:
46
pull_request:
@@ -149,7 +151,7 @@ jobs:
149151

150152
- name: Setup Node
151153
if: matrix.language == 'en'
152-
uses: actions/setup-node@v4
154+
uses: actions/setup-node@v5
153155
with:
154156
node-version: 22
155157
cache: "npm"

.github/workflows/check-msgid-changes.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: Prevent unintended msgid changes
2+
permissions:
3+
contents: read
24

35
on:
46
pull_request:

.github/workflows/install-mdbook/action.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,19 @@ runs:
1515
- name: Install mdbook-pandoc dependencies
1616
uses: ./.github/workflows/apt-get-install
1717
with:
18-
packages: texlive texlive-luatex texlive-lang-cjk texlive-lang-arabic librsvg2-bin fonts-noto
18+
packages: >
19+
fonts-noto
20+
fonts-noto-cjk
21+
fonts-noto-color-emoji
22+
fonts-noto-extra
23+
fonts-symbola
24+
librsvg2-bin
25+
texlive
26+
texlive-fonts-recommended
27+
texlive-lang-arabic
28+
texlive-lang-cjk
29+
texlive-lang-japanese
30+
texlive-luatex
1931
2032
- name: Install mdbook-pandoc
2133
run: |

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
pull-requests: write
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/labeler@v5
12+
- uses: actions/labeler@v6
1313
with:
1414
sync-labels: true

.github/workflows/lint.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: Lint
2+
permissions:
3+
contents: read
24

35
on:
46
pull_request:
@@ -50,6 +52,6 @@ jobs:
5052
uses: actions/checkout@v5
5153

5254
- name: Check for typos
53-
uses: crate-ci/typos@v1.35.7
55+
uses: crate-ci/typos@v1.37.0
5456
with:
5557
config: ./.github/typos.toml

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ these can ensure the solution is correct.
3535

3636
We test the course material in several ways:
3737

38-
- `mdbook test`: This will test the code samples. Some code sampes are marked
38+
- `mdbook test`: This will test the code samples. Some code samples are marked
3939
with `ignore` in the Markdown file because the Playground is missing some of
4040
the crates we use. For this we have
4141
- `cargo test`: This will build and test the Rust code found in our tooling, as

Cargo.lock

Lines changed: 51 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)