diff options
-rw-r--r-- | .gitlab-ci.yml | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83bdd6f6d..0d52caf6b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,8 +23,8 @@ variables: before_script: - mkdir -p _ccache script: - - meson ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _build . - - ninja -C _build + - meson setup ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _build . + - meson compile -C _build - .gitlab/scripts/run-tests.sh _build artifacts: when: always @@ -69,7 +69,7 @@ macos: - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH script: - meson setup -Dintrospection=disabled -Dinstalled_tests=false -Dman=false -Dgtk_doc=false _build - - meson compile -C_build + - meson compile -C _build artifacts: when: always paths: @@ -90,9 +90,11 @@ reference: variables: BUILD_OPTS: "-Dbuildtype=release -Dgtk_doc=true" script: - - meson ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _build . - - ninja -C _build gdk-pixbuf-doc - - mv _build/docs/html _reference + - meson setup ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _build . + - meson compile -C _build + - mkdir -p _reference + - mv _build/docs/gdk-pixbuf/ _reference/gdk-pixbuf/ + - mv _build/docs/gdk-pixdata/ _reference/gdk-pixdata/ artifacts: when: on_success paths: @@ -105,7 +107,7 @@ static-scan: variables: BUILD_OPTS: "--buildtype=debug" script: - - meson ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _scan_build + - meson setup ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _scan_build - ninja -C _scan_build scan-build artifacts: paths: @@ -121,8 +123,8 @@ asan-build: needs: [] variables: script: - - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled _build - - ninja -C _build + - CC=clang meson setup --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled _build + - meson compile -C _build - .gitlab/scripts/run-tests.sh _build artifacts: paths: @@ -139,13 +141,14 @@ release-dist: - meson ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _build . - meson compile -C _build - meson dist -C _build - - ninja -C _build gdk-pixbuf-doc - - tar -c -J -f _build/gdk-pixbuf-docs-${CI_COMMIT_TAG}.tar.xz _build/docs/ + - tar -c -J -f _build/gdk-pixbuf-docs-${CI_COMMIT_TAG}.tar.xz _build/docs/gdk-pixbuf/ + - tar -c -J -f _build/gdk-pixdata-docs-${CI_COMMIT_TAG}.tar.xz _build/docs/gdk-pixdata/ artifacts: when: on_success paths: - _build/meson-dist/gdk-pixbuf-${CI_COMMIT_TAG}.tar.xz - _build/gdk-pixbuf-docs-${CI_COMMIT_TAG}.tar.xz + - _build/gdk-pixdata-docs-${CI_COMMIT_TAG}.tar.xz only: - tags |