chore(nix-actions): Update and take advantage of the new stuff

.forgejo/workflows/npins-update.yaml

@@ -4,21 +4,24 @@ jobs:
     steps:
     - uses: actions/checkout@v3
       with:
-        depth: 0
+        fetch-depth: 0
         token: ${{ secrets.TEA_DGNUM_CHORES_TOKEN }}
-    - name: Update dependencies and open PR if necessary
+    - env:
+        GIT_AUTHOR_EMAIL: tech@dgnum.eu
+        GIT_AUTHOR_NAME: DGNum Chores
+        GIT_COMMITTER_EMAIL: tech@dgnum.eu
+        GIT_COMMITTER_NAME: DGNum Chores
+      name: Update dependencies and open PR if necessary
       run: "npins update\n\nif [ ! -z \"$(git diff --name-only)\" ]; then\n  echo
         \"[+] Changes detected, pushing updates.\"\n\n  git switch -C npins-update\n\
-        \n  git add npins\n\n  git config user.name \"DGNum Chores\"\n  git config
+        \n  git add npins\n\n  git commit --message \"chore(npins): Update\"\n  git
-        user.email \"tech@dgnum.eu\"\n\n  git commit --message \"chore(npins): Update\"\
+        push --set-upstream origin npins-update --force\n\n  # Connect to the server
-        \n  git push --set-upstream origin npins-update --force\n\n  # Connect to
+        with the cli\n  tea login add \\\n    -n dgnum-chores \\\n    -t \"${{ secrets.TEA_DGNUM_CHORES_TOKEN
-        the server with the cli\n  tea login add \\\n    -n dgnum-chores \\\n    -t
+        }}\" \\\n    -u https://git.dgnum.eu\n\n  # Create a pull request if needed\n\
-        \"${{ secrets.TEA_DGNUM_CHORES_TOKEN }}\" \\\n    -u https://git.dgnum.eu\n\
+        \  # i.e. no PR with the same title exists\n  if [ -z \"$(tea pr ls -f='title,author'
-        \n  # Create a pull request if needed\n  # i.e. no PR with the same title
+        -o simple | grep 'chore(npins): Update dgnum-chores')\" ]; then\n    tea pr
-        exists\n  if [ -z \"$(tea pr ls -f='title,author' -o simple | grep 'chore(npins):
+        create \\\n      --description \"Automatic npins update\" \\\n      --title
-        Update dgnum-chores')\" ]; then\n    tea pr create \\\n      --description
+        \"chore(npins): Update\" \\\n      --head npins-update\n  fi\nfi\n"
-        \"Automatic npins update\" \\\n      --title \"chore(npins): Update\" \\\n\
-        \      --head npins-update\n  fi\nfi\n"
 name: npins update
 on:
   schedule:

default.nix

@@ -18,6 +18,7 @@ let
     ;
 
   nix-reuse = import sources.nix-reuse { inherit pkgs; };
+  nix-actions = import sources.nix-actions { inherit pkgs; };
 
   git-checks = (import sources.git-hooks).run {
     src = ./.;
@@ -117,7 +118,7 @@ let
     ];
   };
 
-  workflows = (import sources.nix-actions { inherit pkgs; }).install {
+  workflows = nix-actions.install {
     src = ./.;
 
     workflows = mapAttrs' (
@@ -125,8 +126,12 @@ let
       nameValuePair (removeSuffix ".nix" name) (
         let
           w = import ./workflows/${name};
+          args = {
+            inherit nix-actions;
+            inherit (pkgs) lib;
+          };
         in
-        if isFunction w then w { inherit (pkgs) lib; } else w
+        if (isFunction w) then (w args) else w
       )
     ) (builtins.readDir ./workflows);
   };
@@ -165,11 +170,11 @@ in
       (pkgs.callPackage "${sources.lon}/nix/packages/lon.nix" { })
     ] ++ git-checks.enabledPackages ++ (builtins.attrValues scripts);
 
-    shellHook = ''
+    shellHook = builtins.concatStringsSep "\n" [
-      ${git-checks.shellHook}
+      git-checks.shellHook
-      ${workflows.shellHook}
+      reuse.shellHook
-      ${reuse.shellHook}
+      workflows.shellHook
-    '';
+    ];
 
     preferLocalBuild = true;
 

npins/sources.json

@@ -225,10 +225,10 @@
       "pre_releases": false,
       "version_upper_bound": null,
       "release_prefix": null,
-      "version": "v0.2.2",
+      "version": "v0.2.3",
-      "revision": "b9cb5d6f945d1e3fd7b70d63848c70335e9912e8",
+      "revision": "3c07af3887626062cf9d25967998c582c1b2d9df",
       "url": null,
-      "hash": "0m6bw5qlrchsigx7x4nz3xkcn3dnr14k5j0ws9lbggnldnz9qg2w"
+      "hash": "135g3sjx885vp880ijnfjmrc7krkr85c1xxxqkdy5qagr454k1jv"
     },
     "nix-modules": {
       "type": "Git",

workflows/eval-nodes.nix

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: EUPL-1.2
 
-{ lib }:
+{ lib, nix-actions }:
 
 let
   inherit (lib) attrNames genAttrs;
@@ -27,7 +27,7 @@ in
         env = {
           STORE_ENDPOINT = "https://tvix-store.dgnum.eu/infra-signing/";
           STORE_USER = "admin";
-          STORE_PASSWORD = "\${{ secrets.STORE_PASSWORD }}";
+          STORE_PASSWORD = nix-actions.lib.secret "STORE_PASSWORD";
           BUILD_NODE = node;
         };
       }

workflows/eval-shell.nix

@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: EUPL-1.2
 
+{ nix-actions, ... }:
+
 {
   name = "Build the shell";
   on = {
@@ -20,7 +22,7 @@
           env = {
             STORE_ENDPOINT = "https://tvix-store.dgnum.eu/infra-signing/";
             STORE_USER = "admin";
-            STORE_PASSWORD = "\${{ secrets.STORE_PASSWORD }}";
+            STORE_PASSWORD = nix-actions.lib.secret "STORE_PASSWORD";
           };
         }
       ];

workflows/npins-update.nix

@@ -2,58 +2,62 @@
 #
 # SPDX-License-Identifier: EUPL-1.2
 
+{ nix-actions, ... }:
+
 {
   name = "npins update";
   on.schedule = [
-    # Run at 11 o'clock every wednesday
+    # Run at 15:25 everyday
     { cron = "25 15 * * *"; }
   ];
 
   jobs.npins_update = {
     runs-on = "nix";
     steps = [
-      {
+      (nix-actions.steps.checkout {
-        uses = "actions/checkout@v3";
+        fetch-depth = 0;
-        "with" = {
+        token = nix-actions.lib.secret "TEA_DGNUM_CHORES_TOKEN";
-          depth = 0;
+      })
-          token = "\${{ secrets.TEA_DGNUM_CHORES_TOKEN }}";
-        };
-      }
 
       {
         name = "Update dependencies and open PR if necessary";
-        run = ''
+        run = # bash
-          npins update
+          ''
+            npins update
 
-          if [ ! -z "$(git diff --name-only)" ]; then
+            if [ ! -z "$(git diff --name-only)" ]; then
-            echo "[+] Changes detected, pushing updates."
+              echo "[+] Changes detected, pushing updates."
 
-            git switch -C npins-update
+              git switch -C npins-update
 
-            git add npins
+              git add npins
 
-            git config user.name "DGNum Chores"
+              git commit --message "chore(npins): Update"
-            git config user.email "tech@dgnum.eu"
+              git push --set-upstream origin npins-update --force
 
-            git commit --message "chore(npins): Update"
+              # Connect to the server with the cli
-            git push --set-upstream origin npins-update --force
+              tea login add \
+                -n dgnum-chores \
+                -t "${nix-actions.lib.secret "TEA_DGNUM_CHORES_TOKEN"}" \
+                -u https://git.dgnum.eu
 
-            # Connect to the server with the cli
+              # Create a pull request if needed
-            tea login add \
+              # i.e. no PR with the same title exists
-              -n dgnum-chores \
+              if [ -z "$(tea pr ls -f='title,author' -o simple | grep 'chore(npins): Update dgnum-chores')" ]; then
-              -t "''${{ secrets.TEA_DGNUM_CHORES_TOKEN }}" \
+                tea pr create \
-              -u https://git.dgnum.eu
+                  --description "Automatic npins update" \
-
+                  --title "chore(npins): Update" \
-            # Create a pull request if needed
+                  --head npins-update
-            # i.e. no PR with the same title exists
+              fi
-            if [ -z "$(tea pr ls -f='title,author' -o simple | grep 'chore(npins): Update dgnum-chores')" ]; then
-              tea pr create \
-                --description "Automatic npins update" \
-                --title "chore(npins): Update" \
-                --head npins-update
             fi
-          fi
+          '';
-        '';
+
+        env = {
+          GIT_AUTHOR_NAME = "DGNum Chores";
+          GIT_AUTHOR_EMAIL = "tech@dgnum.eu";
+          GIT_COMMITTER_NAME = "DGNum Chores";
+          GIT_COMMITTER_EMAIL = "tech@dgnum.eu";
+        };
       }
     ];
   };