From 3cf6bbafc12f30d44effbb95a5e758ba08824957 Mon Sep 17 00:00:00 2001 From: Nico Jensch Date: Sun, 18 Aug 2024 10:36:19 +0200 Subject: [PATCH] feat(chaotic-v4): add new env; cleanup --- nixos/hosts/chaotic-v4/docker-compose.nix | 18 ++---------------- nixos/hosts/garuda-build/docker-compose.nix | 1 + 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/nixos/hosts/chaotic-v4/docker-compose.nix b/nixos/hosts/chaotic-v4/docker-compose.nix index 2e107be..ae63bac 100644 --- a/nixos/hosts/chaotic-v4/docker-compose.nix +++ b/nixos/hosts/chaotic-v4/docker-compose.nix @@ -62,6 +62,7 @@ image = "registry.gitlab.com/garuda-linux/tools/chaotic-manager/manager:latest"; environment = { "BUILDER_HOSTNAME" = "immortalis"; + "CI_CODE_SKIP" = "123"; "DATABASE_HOST" = "host.docker.internal"; "DATABASE_PORT" = "22"; "REDIS_SSH_HOST" = "host.docker.internal"; @@ -109,6 +110,7 @@ virtualisation.oci-containers.containers."chaotic-manager" = { image = "registry.gitlab.com/garuda-linux/tools/chaotic-manager/manager:latest"; environment = { + "CI_CODE_SKIP" = "123"; "DATABASE_HOST" = "builds.garudalinux.org"; "DATABASE_PORT" = "400"; "DATABASE_USER" = "package-deployer"; @@ -119,9 +121,6 @@ "chaotic-aur": { "url": "https://gitlab.com/chaotic-aur/pkgbuilds" }, - "chaotic-aur-kde": { - "url": "https://gitlab.com/chaotic-aur/pkgbuilds-kde" - }, "garuda": { "url": "https://gitlab.com/garuda-linux/pkgbuilds" }, @@ -160,19 +159,6 @@ "https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst" ] }, - "chaotic-aur-kde": { - "extra_repos": [ - { - "name": "chaotic-aur-kde", - "servers": [ - "https://builds.garudalinux.org/chaotic-kde-v4/x86_64" - ] - } - ], - "extra_keyrings": [ - "https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst" - ] - }, "garuda": { "extra_repos": [ { diff --git a/nixos/hosts/garuda-build/docker-compose.nix b/nixos/hosts/garuda-build/docker-compose.nix index 79565f2..c86de8e 100644 --- a/nixos/hosts/garuda-build/docker-compose.nix +++ b/nixos/hosts/garuda-build/docker-compose.nix @@ -15,6 +15,7 @@ environment = { "BUILDER_HOSTNAME" = "garuda-build"; "BUILDER_TIMEOUT" = "8600"; + "CI_CODE_SKIP" = "123"; "DATABASE_HOST" = "builds.garudalinux.org"; "DATABASE_PORT" = "400"; "REDIS_SSH_HOST" = "builds.garudalinux.org";