diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2022-11-16 08:33:51 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2022-11-16 09:00:22 +1000 |
| commit | 56b9cac8651469e2e0875357f845a82f9badfa24 (patch) | |
| tree | 2537595e390bb962147ada22de0d2aabfd26593d | |
| parent | 44f42dc9706b3806f799fa93b3b62664207c045a (diff) | |
| download | libinput-56b9cac8651469e2e0875357f845a82f9badfa24.tar.gz | |
gitlab CI: update freebsd to 13.1
This gets rid of of the following error:
ld-elf.so.1: /lib/libc.so.7: version FBSD_1.7 required by /usr/local/lib/libpython3.9.so.1.0 not found
Too tired to debug what is really going on, so let's pretend the update
is the best way to fix this.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | .gitlab-ci.yml | 26 | ||||
| -rw-r--r-- | .gitlab-ci/config.yml | 4 |
2 files changed, 15 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91b5d302..01604818 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,12 +88,12 @@ 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: '2022-09-02.0' - DEBIAN_TAG: '2022-09-02.0' - UBUNTU_TAG: '2022-09-02.0' - ARCH_TAG: '2022-09-02.0' - ALPINE_TAG: '2022-09-02.0' - FREEBSD_TAG: '2022-09-02.0' + FEDORA_TAG: '2022-11-16.1' + DEBIAN_TAG: '2022-11-16.1' + UBUNTU_TAG: '2022-11-16.1' + ARCH_TAG: '2022-11-16.1' + ALPINE_TAG: '2022-11-16.1' + FREEBSD_TAG: '2022-11-16.1' FDO_UPSTREAM_REPO: libinput/libinput @@ -262,7 +262,7 @@ alpine:latest@container-prep: FDO_DISTRIBUTION_PACKAGES: $ALPINE_PACKAGES FDO_DISTRIBUTION_TAG: $ALPINE_TAG -freebsd:13.0@container-prep: +freebsd:13.1@container-prep: extends: - .fdo.qemu-build@freebsd - .policy @@ -271,7 +271,7 @@ freebsd:13.0@container-prep: stage: prep variables: GIT_STRATEGY: none - FDO_DISTRIBUTION_VERSION: '13.0' + FDO_DISTRIBUTION_VERSION: '13.1' FDO_DISTRIBUTION_PACKAGES: $FREEBSD_PACKAGES FDO_DISTRIBUTION_TAG: $FREEBSD_TAG @@ -367,14 +367,14 @@ alpine:latest@container-clean: FDO_DISTRIBUTION_VERSION: 'latest' FDO_DISTRIBUTION_TAG: $ALPINE_TAG -freebsd:13.0@container-clean: +freebsd:13.1@container-clean: extends: - .policy - .container-clean variables: GIT_STRATEGY: none CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG - FDO_DISTRIBUTION_VERSION: '13.0' + FDO_DISTRIBUTION_VERSION: '13.1' FDO_DISTRIBUTION_TAG: $FREEBSD_TAG @@ -982,18 +982,18 @@ alpine:latest@default-build: - "alpine:latest@container-prep" -freebsd:13.0@default-build: +freebsd:13.1@default-build: stage: distro extends: - .build-in-qemu@template - .fdo.distribution-image@freebsd variables: - FDO_DISTRIBUTION_VERSION: '13.0' + FDO_DISTRIBUTION_VERSION: '13.1' FDO_DISTRIBUTION_TAG: $FREEBSD_TAG MESON_ARGS: '-Dtests=false -Ddocumentation=false' # doxygen drags down too many deps MESON_TEST_ARGS: '' # test suite doesn't work on BSD yet needs: - - "freebsd:13.0@container-prep" + - "freebsd:13.1@container-prep" ################################################################# diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 4615684c..bc5ad956 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 '2022-09-02.0' +.default_tag: &default_tag '2022-11-16.1' distributions: - name: fedora @@ -144,7 +144,7 @@ distributions: tag: *default_tag qemu_based: true versions: - - '13.0' + - '13.1' packages: - git - pkgconf |