diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 30fca07d..a26978be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -339,7 +339,7 @@ alpine:latest@container-prep: FDO_DISTRIBUTION_PACKAGES: $ALPINE_PACKAGES FDO_DISTRIBUTION_TAG: $ALPINE_TAG -freebsd:14.2@container-prep: +freebsd:14.3@container-prep: extends: - .fdo.qemu-build@freebsd - .policy @@ -349,7 +349,7 @@ freebsd:14.2@container-prep: stage: prep variables: GIT_STRATEGY: none - FDO_DISTRIBUTION_VERSION: '14.2' + FDO_DISTRIBUTION_VERSION: '14.3' FDO_DISTRIBUTION_PACKAGES: $FREEBSD_PACKAGES FDO_DISTRIBUTION_TAG: $FREEBSD_TAG @@ -446,14 +446,14 @@ alpine:latest@container-clean: FDO_DISTRIBUTION_VERSION: 'latest' FDO_DISTRIBUTION_TAG: $ALPINE_TAG -freebsd:14.2@container-clean: +freebsd:14.3@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: '14.2' + FDO_DISTRIBUTION_VERSION: '14.3' FDO_DISTRIBUTION_TAG: $FREEBSD_TAG @@ -1344,18 +1344,19 @@ alpine:latest@default-build: - "alpine:latest@container-prep" -freebsd:14.2@default-build: +freebsd:14.3@default-build: stage: distro extends: - .build-in-qemu@template - .fdo.distribution-image@freebsd variables: - FDO_DISTRIBUTION_VERSION: '14.2' + FDO_DISTRIBUTION_VERSION: '14.3' 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 + ASSUME_ALWAYS_YES: yes needs: - - "freebsd:14.2@container-prep" + - "freebsd:14.3@container-prep" ################################################################# diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 7edc2104..71f5573e 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -152,7 +152,7 @@ distributions: tag: *default_tag qemu_based: true versions: - - '14.2' + - '14.3' packages: - git - pkgconf @@ -171,6 +171,7 @@ distributions: # We don't run the tests on FreeBSD, someone would have to fix the # test suite to work on BSD first. - "MESON_TEST_ARGS: '' # test suite doesn't work on BSD yet" + - "ASSUME_ALWAYS_YES: yes" test_suites: - name: touchpad