From 4c32df27891cfc90403b0fc4dda2fda4dc41f85a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Thu, 10 Jul 2025 20:26:19 +0200
Subject: [PATCH] refactor: move scripts to scripts folder

This is a bit tidier.
---
 action.yml                                           | 12 ++++++------
 comment_on_pr.sh => scripts/comment_on_pr.sh         |  4 ++--
 create-report.sh => scripts/create-report.sh         |  8 ++++----
 .../retrieve-old-report.sh                           |  2 +-
 utils.sh => scripts/utils.sh                         |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)
 rename comment_on_pr.sh => scripts/comment_on_pr.sh (98%)
 rename create-report.sh => scripts/create-report.sh (91%)
 rename retrieve-old-report.sh => scripts/retrieve-old-report.sh (98%)
 rename utils.sh => scripts/utils.sh (79%)

diff --git a/action.yml b/action.yml
index 46431b7..c2cf28e 100644
--- a/action.yml
+++ b/action.yml
@@ -71,7 +71,7 @@ runs:
       id: pr-number
       if: inputs.comment-on-pr == 'true'
       run: |
-        . "$GITHUB_ACTION_PATH/utils.sh"
+        . "$GITHUB_ACTION_PATH/scripts/utils.sh"
 
         log 'Determine head_ref'
         # For push & tag events it'll bet GITHUB_REF_NAME, for pull_request events it'll be GITHUB_HEAD_REF
@@ -121,7 +121,7 @@ runs:
         BASE_BRANCH: ${{ inputs.base-branch }}
         JOB_NAME: ${{ inputs.job-name }}
       run: |
-        . "$GITHUB_ACTION_PATH/utils.sh"
+        . "$GITHUB_ACTION_PATH/scripts/utils.sh"
 
         # Input validation
         if [ "$DO_COMPARISON" = 'true' ] && [ -z "$JOB_NAME" ]; then
@@ -130,17 +130,17 @@ runs:
         fi
 
         # Create Size Report
-        "$GITHUB_ACTION_PATH/create-report.sh" > report.json
+        "$GITHUB_ACTION_PATH/scripts/create-report.sh" > report.json
 
         # Nothing else to do
         if [ "$COMMENT" != 'true' ]; then exit 0; fi
 
         # Try to do a comparison report
         if [ "$DO_COMPARISON" = 'true' ]; then
-          if "$GITHUB_ACTION_PATH/retrieve-old-report.sh" && [ -f old-report.json ]; then
+          if "$GITHUB_ACTION_PATH/scripts/retrieve-old-report.sh" && [ -f old-report.json ]; then
             log "Reporting on sizes and comparing to sizes in $HEAD_BRANCH"
 
-            "$GITHUB_ACTION_PATH/comment_on_pr.sh" report.json old-report.json
+            "$GITHUB_ACTION_PATH/scripts/comment_on_pr.sh" report.json old-report.json
             exit 0
           else
             error 'Failed to do comparison, fallback to posting the report without them'
@@ -149,7 +149,7 @@ runs:
 
         # Just report values
         log 'Reporting on sizes'
-        "$GITHUB_ACTION_PATH/comment_on_pr.sh" report.json
+        "$GITHUB_ACTION_PATH/scripts/comment_on_pr.sh" report.json
     - name: Upload Artifact
       uses: https://git.salame.cl/actions/upload-artifact@v4
       if: inputs.generate-artifact == 'true'
diff --git a/comment_on_pr.sh b/scripts/comment_on_pr.sh
similarity index 98%
rename from comment_on_pr.sh
rename to scripts/comment_on_pr.sh
index 9122a22..b927400 100755
--- a/comment_on_pr.sh
+++ b/scripts/comment_on_pr.sh
@@ -2,9 +2,9 @@
 
 set -eu
 
-util_path="${GITHUB_ACTION_PATH:-.}/utils.sh"
+util_path="${GITHUB_ACTION_PATH:-.}/scripts/utils.sh"
 
-# shellcheck source=utils.sh
+# shellcheck source=scripts/utils.sh
 . "${util_path}"
 
 # USAGE: json_to_md_rows <FIELD> [JSON_FILE]
diff --git a/create-report.sh b/scripts/create-report.sh
similarity index 91%
rename from create-report.sh
rename to scripts/create-report.sh
index a463eb7..628e024 100755
--- a/create-report.sh
+++ b/scripts/create-report.sh
@@ -2,9 +2,9 @@
 
 set -eu
 
-util_path="${GITHUB_ACTION_PATH:-.}/utils.sh"
+util_path="${GITHUB_ACTION_PATH:-.}/scripts/utils.sh"
 
-# shellcheck source=utils.sh
+# shellcheck source=scripts/utils.sh
 . "${util_path}"
 
 group 'Retrieving Flake information'
@@ -44,8 +44,8 @@ pkgs_json() {
   for package in $packages; do
     log "Building $package"
     path=$(nix build --print-out-paths ".#$package")
-    log "Calculating size of $package"
-    nix path-info --closure-size --json "$path" |
+    log "Calculating size of $package at $path"
+    nix path-info --closure-size --json "$path" | tee |
       jq --compact-output --arg pkg "$package" '.[] | {"name": $pkg, "size": .closureSize, "narSize": .narSize}'
   done
   endgroup
diff --git a/retrieve-old-report.sh b/scripts/retrieve-old-report.sh
similarity index 98%
rename from retrieve-old-report.sh
rename to scripts/retrieve-old-report.sh
index 14a48db..d1ab0f2 100755
--- a/retrieve-old-report.sh
+++ b/scripts/retrieve-old-report.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${GITHUB_ACTION_PATH}/utils.sh"
+. "${GITHUB_ACTION_PATH}/scripts/utils.sh"
 
 repo_info() {
   curl -X GET \
diff --git a/utils.sh b/scripts/utils.sh
similarity index 79%
rename from utils.sh
rename to scripts/utils.sh
index e61c2a3..74c31a3 100755
--- a/utils.sh
+++ b/scripts/utils.sh
@@ -13,9 +13,9 @@ error() {
 }
 
 group() {
-  log "::group::$1"
+  echo "::group::$1"
 }
 
 endgroup() {
-  log '::endgroup::'
+  echo '::endgroup::'
 }