diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-02-12 21:24:14 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-02-12 21:24:14 +0000 |
| commit | c2497bd5fddb1ae3a621fcfb89915756fe5f218e (patch) | |
| tree | 6a3e5edcace1c4140909f157e026a6262b176bde | |
| parent | dde52e89892f05f372e7c9717e03753ca476dcb0 (diff) | |
| parent | 2404112f11e2427c6babd54b1f7d28fd0a321960 (diff) | |
| download | pango-c2497bd5fddb1ae3a621fcfb89915756fe5f218e.tar.gz | |
Merge branch 'macos-ci2' into 'master'
Revert "ci: Temporarily disable macOS CI job as runner is offline"
See merge request GNOME/pango!284
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1126fb29..72593353 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,9 +86,7 @@ msys2-mingw64: - "${CI_PROJECT_DIR}/_build/hello.png" - "${CI_PROJECT_DIR}/_build/fontlist.txt" -# FIXME: Temporarily disabled while the macOS runner is offline -# See https://gitlab.gnome.org/Infrastructure/GitLab/-/issues/495 -.macos: +macos: extends: .only-default only: - branches@GNOME/pango @@ -99,7 +97,6 @@ msys2-mingw64: 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 |