Skip to content

Commit d6caefb

Browse files
authored
Merge branch 'main' into rustlingsua
2 parents c2455bc + d9b6364 commit d6caefb

54 files changed

Lines changed: 1167 additions & 860 deletions

Some content is hidden

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

.github/workflows/rust.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ on:
55
branches: [main]
66
paths-ignore:
77
- website
8+
- .github/workflows/website.yml
89
- '*.md'
910
pull_request:
1011
branches: [main]
1112
paths-ignore:
1213
- website
14+
- .github/workflows/website.yml
1315
- '*.md'
1416

1517
env:
@@ -19,13 +21,13 @@ jobs:
1921
clippy:
2022
runs-on: ubuntu-latest
2123
steps:
22-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v6
2325
- name: Clippy
2426
run: cargo clippy -- --deny warnings
2527
fmt:
2628
runs-on: ubuntu-latest
2729
steps:
28-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v6
2931
- name: rustfmt
3032
run: cargo fmt --all --check
3133
test:
@@ -34,14 +36,21 @@ jobs:
3436
matrix:
3537
os: [ubuntu-latest, windows-latest, macos-latest]
3638
steps:
37-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v6
3840
- uses: swatinem/rust-cache@v2
3941
- name: cargo test
42+
env:
43+
RUST_BACKTRACE: 1
4044
run: cargo test --workspace
4145
dev-check:
4246
runs-on: ubuntu-latest
4347
steps:
44-
- uses: actions/checkout@v4
48+
- uses: actions/checkout@v6
4549
- uses: swatinem/rust-cache@v2
4650
- name: rustlings dev check
4751
run: cargo dev check --require-solutions
52+
rumdl:
53+
runs-on: ubuntu-latest
54+
steps:
55+
- uses: actions/checkout@v6
56+
- uses: rvben/rumdl@v0

.github/workflows/website.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,36 @@ on:
44
workflow_dispatch:
55
push:
66
branches: [main]
7-
paths: [website]
7+
paths:
8+
- website
9+
- .github/workflows/website.yml
810

911
jobs:
12+
rumdl:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v6
16+
- uses: rvben/rumdl@v0
1017
build:
18+
needs: rumdl
1119
defaults:
1220
run:
1321
working-directory: website
1422
runs-on: ubuntu-latest
1523
steps:
16-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v6
1725
- name: Install TailwindCSS
1826
run: npm install
1927
- name: Build CSS
2028
run: npx @tailwindcss/cli -m -i input.css -o static/main.css
2129
- name: Download Zola
22-
run: curl -fsSL https://github.com/getzola/zola/releases/download/v0.20.0/zola-v0.20.0-x86_64-unknown-linux-gnu.tar.gz | tar xz
30+
run: curl -fsSL https://github.com/getzola/zola/releases/download/v0.22.1/zola-v0.22.1-x86_64-unknown-linux-gnu.tar.gz | tar xz
2331
- name: Build site
2432
run: ./zola build
2533
- name: Upload static files as artifact
26-
uses: actions/upload-pages-artifact@v3
34+
uses: actions/upload-pages-artifact@v4
2735
with:
2836
path: website/public/
29-
3037
deploy:
3138
needs: build
3239
# Grant GITHUB_TOKEN the permissions required to make a Pages deployment
@@ -40,4 +47,4 @@ jobs:
4047
runs-on: ubuntu-latest
4148
steps:
4249
- name: Deploy to GitHub Pages
43-
uses: actions/deploy-pages@v4
50+
uses: actions/deploy-pages@v5

.rumdl.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[global]
2+
output-format = "full"
3+
disable = ["MD013", "MD057"]
4+
5+
[per-file-ignores]
6+
"website/content/_index.md" = ["MD041"]
7+
"website/content/**/*.md" = ["MD028", "MD033"]

0 commit comments

Comments
 (0)