mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-13 15:56:23 +01:00
Merge branch 'wip/lantw/ci-Replace-FreeBSD-11-with-FreeBSD-13' into 'main'
ci: Replace FreeBSD 11 with FreeBSD 13 See merge request GNOME/glib!2248
This commit is contained in:
commit
e3e5a06d2b
@ -338,7 +338,7 @@ vs2017-x64:
|
||||
- _build/meson-logs
|
||||
- "_build/${env:CI_JOB_NAME}-report.xml"
|
||||
|
||||
freebsd-11-x86_64:
|
||||
freebsd-12-x86_64:
|
||||
stage: build
|
||||
only:
|
||||
- branches@GNOME/glib
|
||||
@ -347,7 +347,7 @@ freebsd-11-x86_64:
|
||||
# gitlab-runner and dbus service because we need /var/lib/dbus/machine-id.
|
||||
# To compile GLib, you still have to install the following packages:
|
||||
# desktop-file-utils gettext libiconv meson pkgconf python3 shared-mime-info
|
||||
- freebsd-11
|
||||
- freebsd-12
|
||||
needs: []
|
||||
variables:
|
||||
# CPPFLAGS is required because libintl doesn't use pkg-config.
|
||||
@ -357,8 +357,8 @@ freebsd-11-x86_64:
|
||||
# https://github.com/mesonbuild/meson/issues/1635
|
||||
# https://github.com/mesonbuild/meson/issues/2881
|
||||
LDFLAGS: -L/usr/local/lib -Wl,--disable-new-dtags
|
||||
# FreeBSD doesn't have C.UTF-8 locale.
|
||||
LANG: en_US.UTF-8
|
||||
# FreeBSD supports C.UTF-8 locale since 12.1.
|
||||
LANG: C.UTF-8
|
||||
before_script:
|
||||
- bash .gitlab-ci/show-execution-environment.sh
|
||||
script:
|
||||
@ -370,6 +370,8 @@ freebsd-11-x86_64:
|
||||
- meson ${MESON_COMMON_OPTIONS} --localstatedir=/var -Db_lundef=false -Diconv=external -Dxattr=false _build
|
||||
- ninja -C _build
|
||||
- bash -x ./.gitlab-ci/run-tests.sh
|
||||
except:
|
||||
- tags
|
||||
artifacts:
|
||||
reports:
|
||||
junit: "_build/${CI_JOB_NAME}-report.xml"
|
||||
@ -381,17 +383,16 @@ freebsd-11-x86_64:
|
||||
- "_build/meson-logs"
|
||||
- "_build/${CI_JOB_NAME}-report.xml"
|
||||
|
||||
freebsd-12-x86_64:
|
||||
freebsd-13-x86_64:
|
||||
stage: build
|
||||
only:
|
||||
- branches@GNOME/glib
|
||||
tags:
|
||||
- freebsd-12
|
||||
- freebsd-13
|
||||
needs: []
|
||||
variables:
|
||||
CPPFLAGS: -I/usr/local/include
|
||||
LDFLAGS: -L/usr/local/lib -Wl,--disable-new-dtags
|
||||
# FreeBSD supports C.UTF-8 locale since 12.1.
|
||||
LANG: C.UTF-8
|
||||
before_script:
|
||||
- bash .gitlab-ci/show-execution-environment.sh
|
||||
|
Loading…
Reference in New Issue
Block a user