From 779611c04b7135bbd76a03f5d1320c1d2bc9a5c8 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 28 Sep 2023 15:07:36 -0700 Subject: [PATCH] nix: install prettier, also ignore zig-cache/out --- .github/workflows/test.yml | 6 ++++-- .prettierignore | 8 +++++--- example/app.ts | 6 +++--- nix/devshell.nix | 4 ++++ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dce25a53e..6a8da5e46 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -101,6 +101,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 # Check out repo so we can lint it - - uses: actionsx/prettier@v3 + - uses: cachix/install-nix-action@v23 with: - args: --check . + nix_path: nixpkgs=channel:nixos-unstable + - name: prettier check + run: nix develop -c prettier --check . diff --git a/.prettierignore b/.prettierignore index 920ef4386..a1b713063 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,7 +1,9 @@ # Docs: https://prettier.io/docs/en/ignore.html +flake.lock vendor/ +**/*.html +zig-cache/ +zig-out/ + # macos is managed by XCode GUI macos/ -**/*.html -flake.lock - diff --git a/example/app.ts b/example/app.ts index 2380d198c..b42870a50 100644 --- a/example/app.ts +++ b/example/app.ts @@ -102,12 +102,12 @@ fetch(url.href) group_add_face( group, 0 /* regular */, - deferred_face_new(font_name.ptr, font_name.len, 0 /* text */), + deferred_face_new(font_name.ptr, font_name.len, 0 /* text */) ); group_add_face( group, 0 /* regular */, - deferred_face_new(font_name.ptr, font_name.len, 1 /* emoji */), + deferred_face_new(font_name.ptr, font_name.len, 1 /* emoji */) ); // Initialize our sprite font, without this we just use the browser. @@ -168,7 +168,7 @@ fetch(url.href) group_cache, cp, 0, - -1 /* best choice */, + -1 /* best choice */ ); group_cache_render_glyph(group_cache, font_idx, cp, -1); diff --git a/nix/devshell.nix b/nix/devshell.nix index d8995e189..5b1c18e7d 100644 --- a/nix/devshell.nix +++ b/nix/devshell.nix @@ -5,6 +5,7 @@ , glxinfo , ncurses , nodejs +, nodePackages , parallel , pkg-config , python3 @@ -76,6 +77,9 @@ in mkShell rec { # For web and wasm stuff nodejs + # Linting + nodePackages.prettier + # Testing parallel python3