diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-01-03 20:21:32 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-03 20:21:32 +0000 |
| commit | caef05dda4311d422b7fe5c8b2c1d74545ac6ed2 (patch) | |
| tree | d0bfee86f6545cc5c2409afac1ac02992d434aaf | |
| parent | be37162e3fe93caa7b61b2a222503613f332d59b (diff) | |
| parent | f3e352ce55d71ed1818d722275d3edf5fd030168 (diff) | |
| download | pango-caef05dda4311d422b7fe5c8b2c1d74545ac6ed2.tar.gz | |
Merge branch 'macos-ci' into 'master'
Macos ci
See merge request GNOME/pango!263
| -rw-r--r-- | .gitlab-ci.yml | 27 | ||||
| -rw-r--r-- | subprojects/cairo.wrap | 6 |
2 files changed, 30 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d1433cb..ff36ec71 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,9 +74,30 @@ msys2-mingw64: name: "${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}" when: always paths: - - _build/meson-logs - - _build/hello.png - - _build/fontlist.txt + - "${CI_PROJECT_DIR}/_build/meson-logs" + - "${CI_PROJECT_DIR}/_build/hello.png" + - "${CI_PROJECT_DIR}/_build/fontlist.txt" + +macos: + stage: build + tags: + - macos + needs: [] + before_script: + - pip3 install --user meson==0.56 + - pip3 install --user ninja + - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH + script: + - meson -Dintrospection=disabled + -Dcpp_std=c++11 + -Dpixman:tests=disabled + -Dharfbuzz:coretext=enabled + _build + - ninja -C _build + artifacts: + when: always + paths: + - "${CI_PROJECT_DIR}/_build/meson-logs" reference: image: $FEDORA_IMAGE diff --git a/subprojects/cairo.wrap b/subprojects/cairo.wrap new file mode 100644 index 00000000..5e539239 --- /dev/null +++ b/subprojects/cairo.wrap @@ -0,0 +1,6 @@ +[wrap-git] +directory=cairo +url=https://github.com/matthiasclasen/cairo.git +push-url=ssh://git@gitlab.freedesktop.org:cairo/cairo.git +revision=fix-osx-build +depth=1 |