From 6cd05e503a1946301ff3d9e25ee87fb52e056c0c Mon Sep 17 00:00:00 2001 From: technofab Date: Wed, 3 Sep 2025 10:18:12 +0200 Subject: [PATCH] fix(ci): only specify component version once --- .gitlab-ci.yml | 2 +- nix/repo/ci.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6bc9f2..3dc24e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ deploy:image: \ localhost/nix-ci docker://${CI_REGISTRY_IMAGE}/nix-ci:${CI_COMMIT_TAG}\nfi\n" stage: build-images include: -- component: $CI_SERVER_FQDN/$CI_PROJECT_PATH/nix-gitlab-ci@$CI_COMMIT_SHA@$CI_COMMIT_SHORT_SHA +- component: $CI_SERVER_FQDN/$CI_PROJECT_PATH/nix-gitlab-ci@$CI_COMMIT_SHORT_SHA inputs: version: $CI_COMMIT_SHORT_SHA stages: diff --git a/nix/repo/ci.nix b/nix/repo/ci.nix index 9362a05..38a650d 100644 --- a/nix/repo/ci.nix +++ b/nix/repo/ci.nix @@ -3,7 +3,7 @@ in cilib.mkCI { config.soonix = { - componentUrl = "$CI_SERVER_FQDN/$CI_PROJECT_PATH/nix-gitlab-ci@$CI_COMMIT_SHA"; + componentUrl = "$CI_SERVER_FQDN/$CI_PROJECT_PATH/nix-gitlab-ci"; componentVersion = "$CI_COMMIT_SHORT_SHA"; # bootstrapping still needs to be done in the gitlab-ci.yml directly, # the child pipeline can then use the built images to test them