luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-04 02:06:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

ci: Replace FreeBSD 11 with FreeBSD 13

Browse Source 
FreeBSD 11 will go EOL in a month, and FreeBSD 13 was released several
months ago. Remove the FreeBSD 11 job and add a FreeBSD 13 job.
This commit is contained in:
Ting-Wei Lan 2021-09-03 01:53:26 +08:00
parent f763f2b7cb
commit e99597414c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitlab-ci.yml
View File

@ -338,7 +338,7 @@ vs2017-x64:
- _build/meson-logs - _build/meson-logs
- "_build/${env:CI_JOB_NAME}-report.xml" - "_build/${env:CI_JOB_NAME}-report.xml"
freebsd-11-x86_64: freebsd-12-x86_64:
stage: build stage: build
only: only:
- branches@GNOME/glib - branches@GNOME/glib
@ -347,7 +347,7 @@ freebsd-11-x86_64:
# gitlab-runner and dbus service because we need /var/lib/dbus/machine-id. # gitlab-runner and dbus service because we need /var/lib/dbus/machine-id.
# To compile GLib, you still have to install the following packages: # To compile GLib, you still have to install the following packages:
# desktop-file-utils gettext libiconv meson pkgconf python3 shared-mime-info # desktop-file-utils gettext libiconv meson pkgconf python3 shared-mime-info
- freebsd-11 - freebsd-12
needs: [] needs: []
variables: variables:
# CPPFLAGS is required because libintl doesn't use pkg-config. # 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/1635
# https://github.com/mesonbuild/meson/issues/2881 # https://github.com/mesonbuild/meson/issues/2881
LDFLAGS: -L/usr/local/lib -Wl,--disable-new-dtags LDFLAGS: -L/usr/local/lib -Wl,--disable-new-dtags
# FreeBSD doesn't have C.UTF-8 locale. # FreeBSD supports C.UTF-8 locale since 12.1.
LANG: en_US.UTF-8 LANG: C.UTF-8
before_script: before_script:
- bash .gitlab-ci/show-execution-environment.sh - bash .gitlab-ci/show-execution-environment.sh
script: script:
@ -370,6 +370,8 @@ freebsd-11-x86_64:
- meson ${MESON_COMMON_OPTIONS} --localstatedir=/var -Db_lundef=false -Diconv=external -Dxattr=false _build - meson ${MESON_COMMON_OPTIONS} --localstatedir=/var -Db_lundef=false -Diconv=external -Dxattr=false _build
- ninja -C _build - ninja -C _build
- bash -x ./.gitlab-ci/run-tests.sh - bash -x ./.gitlab-ci/run-tests.sh
except:
- tags
artifacts: artifacts:
reports: reports:
junit: "_build/${CI_JOB_NAME}-report.xml" junit: "_build/${CI_JOB_NAME}-report.xml"
@ -381,17 +383,16 @@ freebsd-11-x86_64:
- "_build/meson-logs" - "_build/meson-logs"
- "_build/${CI_JOB_NAME}-report.xml" - "_build/${CI_JOB_NAME}-report.xml"
freebsd-12-x86_64: freebsd-13-x86_64:
stage: build stage: build
only: only:
- branches@GNOME/glib - branches@GNOME/glib
tags: tags:
- freebsd-12 - freebsd-13
needs: [] needs: []
variables: variables:
CPPFLAGS: -I/usr/local/include CPPFLAGS: -I/usr/local/include
LDFLAGS: -L/usr/local/lib -Wl,--disable-new-dtags LDFLAGS: -L/usr/local/lib -Wl,--disable-new-dtags
# FreeBSD supports C.UTF-8 locale since 12.1.
LANG: C.UTF-8 LANG: C.UTF-8
before_script: before_script:
- bash .gitlab-ci/show-execution-environment.sh - bash .gitlab-ci/show-execution-environment.sh