From 63543aad297b9d410d148aa7e45f2a42cfae0220 Mon Sep 17 00:00:00 2001 From: Luis-Hebendanz Date: Tue, 31 Oct 2023 20:31:31 +0100 Subject: [PATCH 1/2] Changed update-ui-assets to push to IoSL --- 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 a77780f..e43d037 100755 --- a/pkgs/ui/nix/update-ui-assets.sh +++ b/pkgs/ui/nix/update-ui-assets.sh @@ -31,7 +31,7 @@ nix build '.#ui' --out-link "$tmpdir/result" tar --transform 's,^\.,assets,' -czvf "$tmpdir/assets.tar.gz" -C "$tmpdir"/result/lib/node_modules/*/out . NAR_HASH=$(nix-prefetch-url --unpack file://<(cat "$tmpdir/assets.tar.gz")) -owner=$BOT_NAME +owner=IoSL package_name=$(echo -n "$GITHUB_REPOSITORY" | sed 's/\//-/g') package_version=$NAR_HASH baseurl=$GITHUB_SERVER_URL -- 2.51.0 From 45fc4b8b4c2850d1c7f8da81221064bbf82b5809 Mon Sep 17 00:00:00 2001 From: Luis-Hebendanz Date: Tue, 31 Oct 2023 20:41:16 +0100 Subject: [PATCH 2/2] Changed update-ui-assets to push to IoSL --- pkgs/ui/nix/ui-assets.nix | 4 ++-- pkgs/ui/nix/update-ui-assets.sh | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/ui/nix/ui-assets.nix b/pkgs/ui/nix/ui-assets.nix index 261e16b..96265ab 100644 --- a/pkgs/ui/nix/ui-assets.nix +++ b/pkgs/ui/nix/ui-assets.nix @@ -1,5 +1,5 @@ { fetchzip }: fetchzip { - url = "https://gitea.gchq.icu/api/packages/ui-asset-bot/generic/Luis-nextjs-python-web-template/0490isam16py7apig295ji99fjblm44m80b68dv5fbpj3xnvx113/assets.tar.gz"; - sha256 = "0490isam16py7apig295ji99fjblm44m80b68dv5fbpj3xnvx113"; + url = "https://gitea.gchq.icu/api/packages/IoSL/generic/IoSL-service-aware-frontend/1avqlivp7vs693b91ywgzyqgksg781lznf273cvfmjmz8h4sqpp7/assets.tar.gz"; + sha256 = "1avqlivp7vs693b91ywgzyqgksg781lznf273cvfmjmz8h4sqpp7"; } diff --git a/pkgs/ui/nix/update-ui-assets.sh b/pkgs/ui/nix/update-ui-assets.sh index e43d037..0bfc6b1 100755 --- a/pkgs/ui/nix/update-ui-assets.sh +++ b/pkgs/ui/nix/update-ui-assets.sh @@ -17,6 +17,11 @@ if [[ -z "${GITHUB_SERVER_URL:-}" ]]; then exit 1 fi +if [[ -z "${GITHUB_REPOSITORY:-}" ]]; then + echo "Env var GITHUB_REPOSITORY is not set. Please use the repo path here." + exit 1 +fi + 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