Skip to content

Commit

Permalink
Update everything, move to pnpm for Node projects (#600)
Browse files Browse the repository at this point in the history
* Update Rust stuff

* Update website, use pnpm

* website upgrade, regen with pnpm

* up cargo

* up svelte fe

* up cargo

* update to new stuff

* move ci to pnpm

* remove unused deps

* uppppp

* fix nix builds
  • Loading branch information
aumetra committed Oct 24, 2024
1 parent 3cbe5bf commit 126d8b1
Show file tree
Hide file tree
Showing 62 changed files with 9,443 additions and 11,976 deletions.
30 changes: 2 additions & 28 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,9 @@ jobs:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@v4
- uses: DeterminateSystems/magic-nix-cache-action@main
- name: Cache node modules
id: cache-npm
uses: actions/cache@v3
env:
cache-name: cache-node-modules
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Build frontend
working-directory: ./kitsune-fe
run: nix develop ..#frontend --command bash -c "npm i && npm run build"
run: nix develop ..#frontend --command bash -c "pnpm i && pnpm build"

lints:
name: Check lints
Expand All @@ -40,19 +27,6 @@ jobs:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@v4
- uses: DeterminateSystems/magic-nix-cache-action@main
- name: Cache node modules
id: cache-npm
uses: actions/cache@v3
env:
cache-name: cache-node-modules
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Run linter
working-directory: ./kitsune-fe
run: nix develop ..#frontend --command bash -c "npm i && npm run lint"
run: nix develop ..#frontend --command bash -c "pnpm i && pnpm lint"
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# This file was autogenerated by cargo-dist: https://opensource.axo.dev/cargo-dist/
#
# Copyright 2022-2024, axodotdev
# SPDX-License-Identifier: MIT or Apache-2.0
#
Expand Down Expand Up @@ -61,7 +63,7 @@ jobs:
# we specify bash to get pipefail; it guards against the `curl` command
# failing. otherwise `sh` won't catch that `curl` returned non-0
shell: bash
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.19.1/cargo-dist-installer.sh | sh"
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.23.0/cargo-dist-installer.sh | sh"
- name: Cache cargo-dist
uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
uses: withastro/action@v2
with:
path: ./website
package-manager: pnpm@latest
# node-version: 20 # The specific version of Node that should be used to build your site. Defaults to 20. (optional)
# package-manager: pnpm@latest # The Node package manager that should be used to install dependencies and build your site. Automatically detected based on your lockfile. (optional)

deploy:
needs: build
Expand Down
Loading

0 comments on commit 126d8b1

Please sign in to comment.