build: switch to treefmt

recap-utr · Oct 1, 2024 · 0998381 · 0998381
1 parent 75a2448
commit 0998381
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 92 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,24 +3,47 @@ on:
   push:
     branches: [main, beta]
 jobs:
+  format:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: write
+    outputs:
+      git-head: ${{ steps.git-push.outputs.git-head }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: DeterminateSystems/nix-installer-action@v14
+      - uses: DeterminateSystems/magic-nix-cache-action@v8
+      - run: nix fmt
+      - uses: cihelper/action-git-push@v1
+        id: git-push
+        with:
+          commit-message: "refactor: format code"
   check:
     runs-on: ubuntu-latest
+    needs: format
     permissions:
       contents: read
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.format.outputs.git-head }}
       - uses: DeterminateSystems/nix-installer-action@v14
       - uses: DeterminateSystems/magic-nix-cache-action@v8
       - run: nix flake check --show-trace
   release:
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'recap-utr' && github.event_name == 'push' }}
-    needs: check
+    needs:
+      - check
+      - format
     permissions:
       contents: write
       packages: write
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.format.outputs.git-head }}
       - uses: DeterminateSystems/nix-installer-action@v14
       - uses: DeterminateSystems/magic-nix-cache-action@v8
       - uses: cihelper/action-semanticrelease-npm@v1

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -11,8 +11,8 @@
       url = "github:mirkolenz/flocken/v2";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    git-hooks = {
-      url = "github:cachix/git-hooks.nix";
+    treefmt-nix = {
+      url = "github:numtide/treefmt-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -27,7 +27,7 @@
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = import systems;
       imports = [
-        inputs.git-hooks.flakeModule
+        inputs.treefmt-nix.flakeModule
       ];
       perSystem =
         {
@@ -60,24 +60,28 @@
         {
           devShells.default = pkgs.mkShell {
             shellHook = ''
-              ${config.pre-commit.installationScript}
               ${lib.getExe' nodejs "npm"} install
               ${lib.getExe nodejs} --version > .node-version
             '';
-            packages = [ nodejs ];
+            packages = [
+              nodejs
+              config.treefmt.build.wrapper
+            ];
           };
           checks = {
             inherit (config.packages) arguemapper server;
           };
-          pre-commit.settings.hooks = {
-            prettier = {
-              enable = true;
-              excludes = [
-                "flake.lock"
-                "CHANGELOG.md"
-              ];
+          treefmt = {
+            projectRootFile = "flake.nix";
+            programs = {
+              prettier = {
+                enable = true;
+                excludes = [
+                  "CHANGELOG.md"
+                ];
+              };
+              nixfmt.enable = true;
             };
-            nixfmt-rfc-style.enable = true;
           };
           packages = {
             default = npmlock2nix.v2.build {