diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8b56a4d8..64a55a1a 100644 --- 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 index 58837fe7..d66d5669 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flakes": { "locked": { - "lastModified": 1690188146, - "narHash": "sha256-ZTAxZeP0yHg28RzTEC21sRk71F2T0J/Sw20dFBaTbwk=", + "lastModified": 1690190523, + "narHash": "sha256-5x360IfqIwxOK4oIAfE5old2wxmOniaW45qvJblJqlM=", "owner": "deemp", "repo": "flakes", - "rev": "2f941afcc9c757a66aa56ff94fe21f6b3d4cba69", + "rev": "11e0ab649d184b72068caa05c548bbf6add2536e", "type": "github" }, "original": { diff --git a/nix-files/workflow.nix b/nix-files/workflow.nix index ac368ef1..557e2d16 100644 --- 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