Merge pull request 'inline action-checkout' (#67) from flake-parts-refactoring into main

Reviewed-on: #67

modules/web01/jobs.nix

@@ -34,7 +34,7 @@ let
 
         HOME = "/run/${name}";
 
-        # used by action-checkout
+        # used by action-flake-update-pr-clan
         REPO_DIR = "/run/${name}/repo";
 
         # used by git

pkgs/action-checkout/default.nix

@@ -1,9 +0,0 @@
-{ bash
-, coreutils
-, git
-, openssh
-, writePureShellScriptBin
-}:
-writePureShellScriptBin "action-checkout" [ bash coreutils git openssh ] ''
-  bash ${./script.sh}
-''

pkgs/action-checkout/script.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# load BRANCH variable with default
-BRANCH=${BRANCH:-main}
-
-# load REPO_DIR variable with default
-export REPO_DIR=${REPO_DIR:-.}
-
-git clone --depth 1 --branch $BRANCH $REPO $REPO_DIR

pkgs/action-flake-update-pr-clan/default.nix

@@ -1,6 +1,6 @@
 { bash
 , coreutils
-, action-checkout
+, git
 , action-ensure-tea-login
 , action-create-pr
 , action-flake-update
@@ -9,7 +9,7 @@
 writePureShellScriptBin "action-flake-update-pr-clan" [
   bash
   coreutils
-  action-checkout
+  git
   action-ensure-tea-login
   action-create-pr
   action-flake-update

pkgs/action-flake-update-pr-clan/script.sh

@@ -15,8 +15,8 @@ export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_NAME"
 export GITEA_USER="clan-bot"
 export GITEA_URL="https://git.clan.lol"
 
-action-checkout
-cd $REPO_DIR
+git clone --depth 1 --branch main "$REPO" "$REPO_DIR"
+cd "$REPO_DIR"
 action-ensure-tea-login
 action-flake-update
 action-create-pr --assignees clan-bot

pkgs/flake-module.nix

@@ -4,9 +4,6 @@
       inherit (pkgs.callPackage ./renovate { }) renovate;
       gitea = pkgs.callPackage ./gitea { };
 
-      action-checkout = pkgs.callPackage ./action-checkout {
-        inherit (config.writers) writePureShellScriptBin;
-      };
       action-create-pr = pkgs.callPackage ./action-create-pr {
         inherit (config.writers) writePureShellScriptBin;
       };
@@ -18,7 +15,7 @@
       };
       action-flake-update-pr-clan = pkgs.callPackage ./action-flake-update-pr-clan {
         inherit (config.writers) writePureShellScriptBin;
-        inherit (config.packages) action-checkout action-ensure-tea-login action-create-pr action-flake-update;
+        inherit (config.packages) action-ensure-tea-login action-create-pr action-flake-update;
       };
       inherit (pkgs.callPackages ./job-flake-updates {
         inherit (config.writers) writePureShellScriptBin;