Skip to content

Commit

Permalink
Merge branch 'new-release-process' into 'main'
Browse files Browse the repository at this point in the history
Switch to ci-based releases

See merge request GNOME/pango!782
  • Loading branch information
Matthias Clasen committed Dec 9, 2024
2 parents 03f370c + a945c23 commit f1cc842
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 1 deletion.
22 changes: 22 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
include:
- project: 'Infrastructure/gnome-release-service-ci-templates'
file: 'meson-dist.yml'
- project: 'Infrastructure/gnome-release-service-ci-templates'
file: 'release-module.yml'

stages:
- build
- analysis
- docs
- deploy
- release

# Common variables
variables:
Expand Down Expand Up @@ -188,3 +195,18 @@ pages:
- public
only:
- main

release-build:
image: $FEDORA_IMAGE
stage: build
extends: .meson-dist
rules:
- if: $CI_COMMIT_TAG

release-dist:
stage: release
variables:
TARBALL_ARTIFACT_PATH: build/meson-dist/$CI_PROJECT_NAME-$CI_COMMIT_TAG.tar.xz
extends: .release-module
rules:
- if: $CI_COMMIT_TAG
16 changes: 15 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ project('pango', 'c', 'cpp',
],
meson_version : '>= 1.2.0')

add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', '-D_POSIX_THREAD_SAFE_FUNCTIONS', '-D_GNU_SOURCE', ], language: 'c')
add_project_arguments([
'-D_POSIX_C_SOURCE=200809L',
'-D_POSIX_THREAD_SAFE_FUNCTIONS',
'-D_GNU_SOURCE',
],
language: 'c'
)

pango_prefix = get_option('prefix')
pango_libdir = join_paths(pango_prefix, get_option('libdir'))
Expand Down Expand Up @@ -53,6 +59,14 @@ if host_system == 'windows'
add_project_arguments('-D_WIN32_WINNT=_WIN32_WINNT_WIN10', language: 'c')
endif

# Keep in sync with glib_req_version
add_project_arguments([
'-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_70',
'-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_70',
],
language: 'c'
)

# Compiler and linker flags
common_cflags = []
common_cppflags = []
Expand Down

0 comments on commit f1cc842

Please sign in to comment.