From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 19 Apr 2023 23:04:28 +0000 (+1000)
Subject: CI: fix the rpm build job's Fedora version
X-Git-Tag: 1.24.0~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4cf6e9baf7f9699c339d8302a4e9f694aaa7e89;p=platform%2Fupstream%2Flibinput.git

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 <peter.hutterer@who-t.net>
---

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)