From b4cf6e9baf7f9699c339d8302a4e9f694aaa7e89 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 20 Apr 2023 09:04:28 +1000 Subject: CI: fix the rpm build job's Fedora version We have the variable set, we just didn't use it. Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/ci.template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21d8da0d..4b5bb295 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1042,10 +1042,10 @@ build rpm: - .policy stage: deploy variables: - FDO_DISTRIBUTION_VERSION: '36' + FDO_DISTRIBUTION_VERSION: '37' FDO_DISTRIBUTION_TAG: $FEDORA_TAG needs: - - "fedora:36@container-prep" + - "fedora:37@container-prep" script: - meson "$MESON_BUILDDIR" - VERSION=$(meson introspect "$MESON_BUILDDIR" --projectinfo | jq -r .version) diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 4288fee4..21bb4046 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -705,10 +705,10 @@ build rpm: - .policy stage: deploy variables: - FDO_DISTRIBUTION_VERSION: '36' + FDO_DISTRIBUTION_VERSION: '{{version}}' FDO_DISTRIBUTION_TAG: $FEDORA_TAG needs: - - "fedora:36@container-prep" + - "fedora:{{version}}@container-prep" script: - meson "$MESON_BUILDDIR" - VERSION=$(meson introspect "$MESON_BUILDDIR" --projectinfo | jq -r .version) -- cgit v1.2.1