diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2023-04-20 09:04:28 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2023-04-20 09:04:57 +1000 |
| commit | b4cf6e9baf7f9699c339d8302a4e9f694aaa7e89 (patch) | |
| tree | c83656dc2e1f45c4e38ddcca008bdb5aad89f4f9 | |
| parent | 8e34037dcd1d4fc1bd266ccbdfc117985ee4ef03 (diff) | |
| download | libinput-b4cf6e9baf7f9699c339d8302a4e9f694aaa7e89.tar.gz | |
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>
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .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) |