Skip to content

Commit

Permalink
Merge branch 'main' into fsundvik/fix-config-font-size
Browse files Browse the repository at this point in the history
  • Loading branch information
Kethku authored May 11, 2024
2 parents 4ff7fc2 + db8fdb2 commit f7369b1
Show file tree
Hide file tree
Showing 62 changed files with 3,143 additions and 2,702 deletions.
478 changes: 255 additions & 223 deletions .github/workflows/build.yml

Large diffs are not rendered by default.

24 changes: 1 addition & 23 deletions .github/workflows/lint-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ permissions:
contents: read

on:
pull_request:
branches: [main]
workflow_call:

env:
Expand All @@ -17,27 +15,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Run rustfmt
run: cargo fmt --all --check

clippy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: actions/cache@v3
with:
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}

- uses: giraffate/clippy-action@v1
with:
reporter: "github-pr-review"
github_token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/lint-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Lint markdown
uses: nosborn/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-check-frozen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Fetch dependencies
run: cargo fetch
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: snapcore/action-build@v1
env:
SNAPCRAFT_BUILD_ENVIRONMENT_MEMORY: 6G
id: snapcraft

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: snap
path: ${{ steps.snapcraft.outputs.snap }}
Expand Down
33 changes: 0 additions & 33 deletions .github/workflows/snap.yaml

This file was deleted.

16 changes: 8 additions & 8 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Restore mdBook Cache
id: cache-mdbook
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ./mdbook
key: mdbook-${{ env.MDBOOK-VERSION }}
Expand All @@ -36,7 +36,7 @@ jobs:
- name: Restore mdbook-pagetoc Cache
id: cache-mdbook-pagetoc
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ./mdbook-pagetoc
key: mdbook-pagetoc-${{ env.MDBOOK-PAGETOC-VERSION }}
Expand All @@ -49,7 +49,7 @@ jobs:
- name: Restore mdbook-linkcheck Cache
id: cache-mdbook-linkcheck
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ./mdbook-linkcheck
key: mdbook-linkcheck-${{ env.MDBOOK-LINKCHECK-VERSION }}
Expand All @@ -74,7 +74,7 @@ jobs:

- name: Store HTML
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: book
path: ./website/book
Expand All @@ -89,7 +89,7 @@ jobs:

steps:
- name: Download HTML
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: book
path: ./book
Expand All @@ -106,7 +106,7 @@ jobs:
npx sscli --base https://neovide.dev
- name: Store Sitemap
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: sitemap
path: ./book/html/sitemap.xml
Expand All @@ -119,7 +119,7 @@ jobs:

steps:
- name: Download HTML & Sitemap
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4

- name: Move Sitemap Into HTML
run: mv ./sitemap/sitemap.xml ./book/html
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,8 @@
.DS_Store
website/book
*.AppImage
.envrc
flake.nix
flake.lock
.direnv/
.devenv/
Loading

0 comments on commit f7369b1

Please sign in to comment.