From 13a0d948a68121707a1d9f896587561f0ca05060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 14 Apr 2026 00:22:32 +0200 Subject: [PATCH] generate-gitlab-ci: Update rawhide detection logic --- generate-gitlab-ci.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/generate-gitlab-ci.sh b/generate-gitlab-ci.sh index 90da804..c5e3f3b 100755 --- a/generate-gitlab-ci.sh +++ b/generate-gitlab-ci.sh @@ -17,11 +17,9 @@ variants=( ) branch="$(git rev-parse --abbrev-ref HEAD)" -release="" -if [[ "${branch}" == "main" ]] || [[ -f "fedora-rawhide.repo" ]]; then +release="$(rpm-ostree compose tree --print-only "silverblue.yaml" | jq -r '."mutate-os-release"')" +if [[ "$(rpm-ostree compose tree --print-only "silverblue.yaml" | jq -r '.repos[]')" == "fedora-rawhide" ]]; then release="rawhide" -else - release="$(rpm-ostree compose tree --print-only --repo=repo silverblue.yaml | jq -r '."mutate-os-release"')" fi {