fixup: switch to FDO_DISTRIBUTION_EXEC

.gitlab-ci.yml

@@ -19,7 +19,8 @@ stages:
   variables:
     FDO_DISTRIBUTION_VERSION: 33
     FDO_DISTRIBUTION_PACKAGES: 'git autoconf automake libtool make xorg-x11-server-devel libudev-devel libevdev-devel libinput-devel xorg-x11-util-macros'
-    FDO_DISTRIBUTION_TAG: '2021-04-06.0'
+    FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/fedora-install.sh'
+    FDO_DISTRIBUTION_TAG: '2021-09-15.0'
 
 
 fedora@container_build:
@@ -34,13 +35,6 @@ fedora@container_build:
 .default_build:
   stage: build
   script:
-    # we require at least inputproto >= 2.3.99.1 which has been released in xorgproto 2021.5
-    - git clone https://gitlab.freedesktop.org/xorg/proto/xorgproto.git --depth 1 --branch=xorgproto-2021.5
-    - pushd xorgproto
-    - ./autogen.sh
-    - make -j${FDO_CI_CONCURRENT:-4} install
-    - popd
-    - rm -rf xorgproto
     - mkdir _builddir _inst
     - pushd _builddir > /dev/null
     - ../autogen.sh --prefix=$(realpath ../_inst) --disable-silent-rules

.gitlab-ci/fedora-install.sh

+#!/bin/bash
+
+# we require at least inputproto >= 2.3.99.1 which has been released in xorgproto 2021.5
+git clone https://gitlab.freedesktop.org/xorg/proto/xorgproto.git --depth 1 --branch=xorgproto-2021.5
+pushd xorgproto
+./autogen.sh
+make -j${FDO_CI_CONCURRENT:-4} install
+popd
+rm -rf xorgproto