diff options
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | Makefile.am | 12 |
2 files changed, 19 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 864c5515..75bb40a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,16 @@ include: - local: 'ci/container_builds.yml' +# Enable merge request pipelines and avoid duplicate pipelines +# https://docs.gitlab.com/ee/ci/yaml/index.html#switch-between-branch-pipelines-and-merge-request-pipelines +workflow: + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push" + when: never + - if: '$CI_COMMIT_TAG' + - if: '$CI_COMMIT_BRANCH' + variables: LIBRSVG_DEBUG: "yes" # Turn compiler warnings into errors @@ -344,6 +354,7 @@ distcheck: - '.cache' needs: - job: check + artifacts: false tags: # FIXME: remove this once the runners get CentOS upgraded # see https://gitlab.gnome.org/GNOME/librsvg/-/issues/848 @@ -365,6 +376,7 @@ distcheck: when: manual allow_failure: true - if: '$CI_PIPELINE_SOURCE == "schedule"' + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' reference: extends: diff --git a/Makefile.am b/Makefile.am index 1e1ce856..8ae5d21a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -258,17 +258,19 @@ EXTRA_DIST = \ $(LIBRSVG_SRC) \ $(RUST_EXTRA) \ $(RSVG_CONVERT_SRC) \ - librsvg.doap \ AUTHORS \ - NEWS \ COPYING.LIB \ - librsvg-zip.in \ + NEWS.md \ + SECURITY.md \ Rsvg-2.0-custom.vala \ Rsvg-2.0.metadata \ - rsvg-convert.rst \ glib-tap.mk \ + librsvg-zip.in \ + librsvg.doap \ + rsvg-convert.rst \ tap-driver.sh \ - tap-test + tap-test \ + $(NULL) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = librsvg-$(RSVG_API_VERSION).pc |