From 242dbeb2535e3c7db762d212a63d707f651f833e Mon Sep 17 00:00:00 2001 From: Luis Date: Mon, 30 Oct 2023 17:14:15 +0100 Subject: [PATCH 1/3] nix fmt --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 36e7372..1664e7c 100644 --- a/README.md +++ b/README.md @@ -118,4 +118,3 @@ Also set the option `Enable Status Check` to `build / test (pull_request)` Add `merge-bot` and `ui-asset-bot` as collaborators. Also set the option `Delete pull request branch after merge by default` Also the the default merge style to `Rebase then create merge commit` - -- 2.51.0 From a21028aa657dcd2e8666755765e9c8ebcc7db919 Mon Sep 17 00:00:00 2001 From: Luis Date: Mon, 30 Oct 2023 17:21:44 +0100 Subject: [PATCH 2/3] Generate ui assets package_name on the fly --- pkgs/ui/nix/update-ui-assets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/ui/nix/update-ui-assets.sh b/pkgs/ui/nix/update-ui-assets.sh index 7f95bf8..f3577d0 100755 --- a/pkgs/ui/nix/update-ui-assets.sh +++ b/pkgs/ui/nix/update-ui-assets.sh @@ -32,7 +32,7 @@ tar --transform 's,^\.,assets,' -czvf "$tmpdir/assets.tar.gz" -C "$tmpdir"/resul NAR_HASH=$(nix-prefetch-url --unpack file://<(cat "$tmpdir/assets.tar.gz")) owner=$BOT_NAME -package_name=ui +package_name=$(echo -n "$GITHUB_REPOSITORY" | sed 's/\//-/g') package_version=$NAR_HASH baseurl=$GITHUB_SERVER_URL -- 2.51.0 From 8a2c3517f547e62e1b8d113ac8bbd267a16f8f2e Mon Sep 17 00:00:00 2001 From: Luis Date: Mon, 30 Oct 2023 17:32:01 +0100 Subject: [PATCH 3/3] Fixed missing gnused in ui-assets.sh --- pkgs/ui/nix/update-ui-assets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/ui/nix/update-ui-assets.sh b/pkgs/ui/nix/update-ui-assets.sh index f3577d0..a77780f 100755 --- a/pkgs/ui/nix/update-ui-assets.sh +++ b/pkgs/ui/nix/update-ui-assets.sh @@ -17,7 +17,7 @@ if [[ -z "${GITHUB_SERVER_URL:-}" ]]; then exit 1 fi -DEPS=$(nix shell --inputs-from '.#' "nixpkgs#gnutar" "nixpkgs#curl" "nixpkgs#gzip" -c bash -c "echo \$PATH") +DEPS=$(nix shell --inputs-from '.#' "nixpkgs#gnutar" "nixpkgs#gnused" "nixpkgs#curl" "nixpkgs#gzip" -c bash -c "echo \$PATH") export PATH=$PATH:$DEPS -- 2.51.0