From 9ee399c8beef1e04cb9dcd2dacf035526db0886f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 24 Jul 2024 15:05:54 +1000 Subject: [PATCH] CI: Lock hugo to v0.111 to allow for distro updates F40 now ships v0.121 which again breaks something in the relearn theme so let's lock our version here to one we know works and move on with life. I can't be bothered to relearn hugo and themes every few months just for a single static website. --- .gitlab-ci.yml | 12 ++++++++---- .gitlab-ci/ci.template | 6 +++++- .gitlab-ci/config.yml | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de9aa28..215e3a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,7 +38,7 @@ variables: # See the documentation here: # # https://wayland.freedesktop.org/libinput/doc/latest/building_libinput.html # ############################################################################### - FEDORA_PACKAGES: 'git diffutils gcc gcc-c++ pkgconf-pkg-config systemd-devel libxkbcommon-devel libxml2 doxygen python3-attrs python3-pytest python3-dbusmock python3-jinja2 python3-pip python3-pyyaml hugo libabigail ' + FEDORA_PACKAGES: 'git diffutils gcc gcc-c++ pkgconf-pkg-config systemd-devel libxkbcommon-devel libxml2 doxygen python3-attrs python3-pytest python3-dbusmock python3-jinja2 python3-pip python3-pyyaml golang libabigail ' FEDORA_PIP_PACKAGES: 'meson ninja structlog strenum ' DEBIAN_PACKAGES: 'git gcc g++ pkg-config libsystemd-dev libxkbcommon-dev libxml2 doxygen python3-attr python3-pytest python3-dbusmock python3-jinja2 python3-pip python3-yaml ' DEBIAN_PIP_PACKAGES: 'meson ninja structlog strenum ' @@ -48,8 +48,8 @@ variables: # changing these will force rebuilding the associated image # Note: these tags have no meaning and are not tied to a particular # libinput version - FEDORA_TAG: '2023-12-13.0' - DEBIAN_TAG: '2023-12-13.0' + FEDORA_TAG: '2024-07-24.2' + DEBIAN_TAG: '2024-07-24.2' FDO_UPSTREAM_REPO: libinput/libei @@ -249,7 +249,7 @@ build-no-doxygen@fedora:39: variables: MESON_ARGS: "-Ddocumentation=[]" before_script: - - dnf remove -y doxygen hugo + - dnf remove -y doxygen valgrind@fedora:39: extends: @@ -349,6 +349,10 @@ fedora:39@doc-build: FDO_DISTRIBUTION_TAG: $FEDORA_TAG MESON_ARGS: "-Ddocumentation=protocol,api" script: + # Staying up-to-date with the breakages between hugo and the relearn theme is annoying + # so let's lock the version for our doc build + - go install "github.com/gohugoio/hugo@v0.111" + - export PATH="$HOME/go/bin:$PATH" - .gitlab-ci/meson-build.sh - rm -rf public/ - mv "$MESON_BUILDDIR"/doc/protocol/ei/public/ public/ diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 6385967..836a24b 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -249,7 +249,7 @@ build-no-doxygen@{{distro.name}}:{{version}}: variables: MESON_ARGS: "-Ddocumentation=[]" before_script: - - dnf remove -y doxygen hugo + - dnf remove -y doxygen valgrind@{{distro.name}}:{{version}}: extends: @@ -362,6 +362,10 @@ minimum-meson@{{distro.name}}:{{version}}: FDO_DISTRIBUTION_TAG: ${{distro.name.upper()}}_TAG MESON_ARGS: "-Ddocumentation=protocol,api" script: + # Staying up-to-date with the breakages between hugo and the relearn theme is annoying + # so let's lock the version for our doc build + - go install "github.com/gohugoio/hugo@v0.111" + - export PATH="$HOME/go/bin:$PATH" - .gitlab-ci/meson-build.sh - rm -rf public/ - mv "$MESON_BUILDDIR"/doc/protocol/ei/public/ public/ diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index f2530ca..42ac8dc 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -3,7 +3,7 @@ # # We're happy to rebuild all containers when one changes. -.default_tag: &default_tag '2023-12-13.0' +.default_tag: &default_tag '2024-07-24.2' last_abi_break: abe85e051e7029bfd2e7913ab980a9e0042b6d0d minimum_meson_version: 0.57.0 @@ -30,7 +30,7 @@ distributions: - python3-jinja2 - python3-pip - python3-pyyaml - - hugo # for documentation only + - golang # for documentation only - libabigail # for abidiff only pips: - meson