upd workflow

deemp · Jul 24, 2023 · 3ee511c · 3ee511c
1 parent 4f9b4e1
commit 3ee511c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 33 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -33,16 +33,16 @@ jobs:
         run: |
           git config --global user.name github-actions
           git config --global user.email github-actions@github.com
-      - if: matrix.os == 'ubuntu-22.04'
-        name: Format Nix files
-        run: |-
-          nix profile install .#format
-          nix run .#format
       - if: matrix.os == 'ubuntu-22.04'
         name: Update flake locks
         run: |-
           nix profile install .#updateLocks
           nix run .#updateLocks
+      - if: matrix.os == 'ubuntu-22.04'
+        name: Format Nix files
+        run: |-
+          nix profile install .#format
+          nix run .#format
       - if: matrix.os == 'ubuntu-22.04'
         name: Update docs
         run: |-

diff --git a/flake.lock b/flake.lock
diff --git a/nix-files/workflow.nix b/nix-files/workflow.nix
@@ -16,31 +16,27 @@ let
             macosMaxStoreSize = 15000000000;
           };
           doCommit = false;
-          steps = _: stepsIf "${names.matrix.os} == '${os.ubuntu-22}'" [
-            (
-              let nameUpdateDocs = "Update docs"; in
-              [
-                {
-                  name = nameUpdateDocs;
-                  run = run.nixScript { name = scripts.genDocs.pname; };
-                }
-                (steps.commit { messages = [ (steps.updateLocks { }).name (steps.format { }).name nameUpdateDocs ]; })
-              ]
-            )
-            {
-              name = "Copy docs";
-              run = "cp -r docs/book docs/dist";
-            }
-            {
-              name = "Publish docs to GitHub Pages";
-              uses = "peaceiris/actions-gh-pages@v3.9.3";
-              "with" = {
-                github_token = expr names.secrets.GITHUB_TOKEN;
-                publish_dir = "docs/dist";
-                force_orphan = true;
-              };
-            }
-          ];
+          steps = { stepsAttrs, ... }:
+            stepsIf "${names.matrix.os} == '${os.ubuntu-22}'" [
+              {
+                name = "Update docs";
+                run = run.nixScript { name = scripts.genDocs.pname; };
+              }
+              (steps.commit { messages = [ (steps.updateLocks { }).name (steps.format { }).name stepsAttrs."Update docs".name ]; })
+              {
+                name = "Copy docs";
+                run = "cp -r docs/book docs/dist";
+              }
+              {
+                name = "Publish docs to GitHub Pages";
+                uses = "peaceiris/actions-gh-pages@v3.9.3";
+                "with" = {
+                  github_token = expr names.secrets.GITHUB_TOKEN;
+                  publish_dir = "docs/dist";
+                  force_orphan = true;
+                };
+              }
+            ];
         };
       };
 in