diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2023-01-05 09:46:09 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2023-01-05 10:26:39 +1000 |
| commit | 37f71a849395c51b9e9df2d171c7e9f3e76db565 (patch) | |
| tree | e62772a6fbf9a4a89894f5ccb2293bfc5a2f63a4 | |
| parent | 6be54f75c88a8257f1db380f73e36bc9c4fa5ac1 (diff) | |
| download | libevdev-37f71a849395c51b9e9df2d171c7e9f3e76db565.tar.gz | |
gitlab CI: drop the ninja dist for every job
Unlike autotools distcheck which ensures we didn't forget to add
anything to the makefiles, ninja dist just zips up the git repo.
It does run the tests though but without suite selection which is a
problem for us here.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab-ci/ci.template | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4e810e..14851ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,7 +64,7 @@ variables: extends: - .default_artifacts script: - - .gitlab-ci/meson-build.sh + - .gitlab-ci/meson-build.sh --run-test .fedora:34: extends: .fdo.distribution-image@fedora @@ -496,8 +496,6 @@ alpine:latest@container-clean: - .meson_build stage: build dependencies: [] - variables: - NINJA_ARGS: "dist" fedora:34@autotools-build: diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index c8fd9aa..ed08d5d 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -60,7 +60,7 @@ variables: extends: - .default_artifacts script: - - .gitlab-ci/meson-build.sh + - .gitlab-ci/meson-build.sh --run-test {# Generate templates for every distribution/version combination we want, any job can then just extends: .name:version and the images will sort @@ -265,8 +265,6 @@ check-merge-request: - .meson_build stage: build dependencies: [] - variables: - NINJA_ARGS: "dist" {% for distro in distributions %} {% for version in distro.versions %} |