diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a8797314c..40cfe26618 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,14 +6,15 @@ # Edit .gitlab-ci/ci.template instead # # # # Regenerate with: -# TEMPLATE_SHA="$(sed -n 's/^.templates_sha: *\&template_sha *\([0-9a-f]\+\) .*/\1/p' ./.gitlab-ci/ci.template)" +# TEMPLATE_SHA="$(sed -n 's/^.templates_sha: *\&template_sha *\([0-9a-f]\+\)$/\1/p' ./.gitlab-ci/ci.template)" # pip3 install "git+http://gitlab.freedesktop.org/freedesktop/ci-templates@$TEMPLATE_SHA" # ci-fairy generate-template # ######################################## -.templates_sha: &template_sha ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 # see https://docs.gitlab.com/ee/ci/yaml/#includefile +# see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 184ca628f89f3193c249b4e34e45afee2773a833 include: # Alpine container builder template @@ -53,11 +54,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bumping # ".default_tag". - FEDORA_TAG: '2023-01-18.0-81a15acb09ec' - UBUNTU_TAG: '2023-01-18.0-b674114b79c1' - DEBIAN_TAG: '2023-01-18.0-b674114b79c1' - CENTOS_TAG: '2023-01-18.0-81a15acb09ec' - ALPINE_TAG: '2023-01-18.0-14c807942fa4' + FEDORA_TAG: '2023-01-18.0-2fd6b9b2aa64' + UBUNTU_TAG: '2023-01-18.0-d59117c480f0' + DEBIAN_TAG: '2023-01-18.0-d59117c480f0' + CENTOS_TAG: '2023-01-18.0-2fd6b9b2aa64' + ALPINE_TAG: '2023-01-18.0-7cc187484567' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 02b33ff3bc..35eb0a791b 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -8,14 +8,15 @@ # Edit .gitlab-ci/ci.template instead # # # # Regenerate with: -# TEMPLATE_SHA="$(sed -n 's/^.templates_sha: *\&template_sha *\([0-9a-f]\+\) .*/\1/p' ./.gitlab-ci/ci.template)" +# TEMPLATE_SHA="$(sed -n 's/^.templates_sha: *\&template_sha *\([0-9a-f]\+\)$/\1/p' ./.gitlab-ci/ci.template)" # pip3 install "git+http://gitlab.freedesktop.org/freedesktop/ci-templates@$TEMPLATE_SHA" # ci-fairy generate-template # ######################################## -.templates_sha: &template_sha ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 # see https://docs.gitlab.com/ee/ci/yaml/#includefile +# see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 184ca628f89f3193c249b4e34e45afee2773a833 include: {% for distro in distributions|sort(attribute="name") %} diff --git a/.gitlab-ci/fedora-install.sh b/.gitlab-ci/fedora-install.sh index 95ceeb20ec..734ef5a6ac 100755 --- a/.gitlab-ci/fedora-install.sh +++ b/.gitlab-ci/fedora-install.sh @@ -73,7 +73,7 @@ if [ -x /usr/bin/ninja ] && ! [ -x /usr/bin/ninja-build ]; then fi if [ $IS_FEDORA = 1 ]; then - TEMPLATE_SHA="$(sed -n 's/^.templates_sha: *\&template_sha *\([0-9a-f]\+\) .*/\1/p' ./.gitlab-ci/ci.template)" + TEMPLATE_SHA="$(sed -n 's/^.templates_sha: *\&template_sha *\([0-9a-f]\+\)$/\1/p' ./.gitlab-ci/ci.template)" test -n "$TEMPLATE_SHA" dnf install -y python3-pip pip3 install "git+http://gitlab.freedesktop.org/freedesktop/ci-templates@$TEMPLATE_SHA"