From 0ba2ba478f1c95d38699b7562220024ee46be582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Thu, 10 Jul 2025 20:26:19 +0200 Subject: [PATCH 1/3] 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 | 4 ++-- .../retrieve-old-report.sh | 2 +- utils.sh => scripts/utils.sh | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) rename comment_on_pr.sh => scripts/comment_on_pr.sh (98%) rename create-report.sh => scripts/create-report.sh (96%) 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 [JSON_FILE] diff --git a/create-report.sh b/scripts/create-report.sh similarity index 96% rename from create-report.sh rename to scripts/create-report.sh index a463eb7..e29cf4f 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' 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::' } From 95718c754dc32db2fe7d00a8218dc41199f58e8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Thu, 10 Jul 2025 20:29:55 +0200 Subject: [PATCH 2/3] feat(nix): use tarball instead of github ref This should make the downloads faster. --- README.md | 8 ++++---- flake.lock | 17 +++++++---------- flake.nix | 2 +- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index d3bceb9..6e9e21c 100644 --- a/README.md +++ b/README.md @@ -56,9 +56,9 @@ For more details see the [action.yaml](./action.yml) file. | Name | Size | Size Change | NAR Size | NAR Size Change | |------|-----:|------------:|---------:|----------------:| -| `gemini` | 11Gi | -2.4Mi | 28Ki | 0 | -| `leo` | 1.6Gi | 0 | 25Ki | 0 | -| `libra` | 9.4Gi | -2.4Mi | 28Ki | 0 | -| `taurus` | 7.6Gi | 0 | 34Ki | 0 | +| `gemini` | 11Gi | -2.4Mi | 28Ki | 0 | +| `leo` | 1.6Gi | 0 | 25Ki | 0 | +| `libra` | 9.4Gi | -2.4Mi | 28Ki | 0 | +| `taurus` | 7.6Gi | 0 | 34Ki | 0 | diff --git a/flake.lock b/flake.lock index 7e05325..a6376f4 100644 --- a/flake.lock +++ b/flake.lock @@ -20,18 +20,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", - "type": "github" + "lastModified": 1752076035, + "narHash": "sha256-ROMKbpfgrbogAWXNXJxUu+BoPyZdOq/MQ3UNYVP863o=", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre826938.9807714d6944/nixexprs.tar.xz?rev=9807714d6944a957c2e036f84b0ff8caf9930bc0" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, "nixpkgs-lib": { diff --git a/flake.nix b/flake.nix index 46e3e7b..35db44f 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { flake-parts.url = "github:hercules-ci/flake-parts"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"; treefmt-nix = { url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; From 9128ddb0701abac640b80f91e4b1229ae2b3cb00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Thu, 10 Jul 2025 20:26:19 +0200 Subject: [PATCH 3/3] 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 | 4 ++-- .../retrieve-old-report.sh | 2 +- utils.sh => scripts/utils.sh | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) rename comment_on_pr.sh => scripts/comment_on_pr.sh (98%) rename create-report.sh => scripts/create-report.sh (96%) 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 [JSON_FILE] diff --git a/create-report.sh b/scripts/create-report.sh similarity index 96% rename from create-report.sh rename to scripts/create-report.sh index a463eb7..e29cf4f 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' 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::' }