summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@gnome.org>2022-09-26 13:04:20 -0500
committerFederico Mena Quintero <federico@gnome.org>2022-09-26 13:21:23 -0500
commit7c54ccebb3c5ce709b53277bae11d4b5358247ff (patch)
tree32ae5e20977441f9cf5a07cb477e56e0c456a378 /.gitlab-ci.yml
parentadc2d2e0e21258bad797b4400fb2382988886989 (diff)
downloadlibrsvg-7c54ccebb3c5ce709b53277bae11d4b5358247ff.tar.gz
CI: Use just 'cargo test' for the rust-minimum and rust-nightly jobs
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/754>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml18
1 files changed, 12 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f031893..78255d9e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,6 +79,12 @@ test_rust_gdk_pixbuf_loader:
- cd gdk-pixbuf-loader
- cargo test
+.cargo-test:
+ extends: '.cache'
+ stage: build
+ script:
+ - cargo test
+
.build-rsvg-no-docs:
extends: '.cache'
stage: build
@@ -111,7 +117,7 @@ test_rust_gdk_pixbuf_loader:
- _build/tests/*.log
expire_in: 1 day
-build-rsvg-opensuse@x86_64.stable:
+autotools build - opensuse@x86_64.stable:
extends:
- '.container.opensuse@x86_64.stable'
- .fdo.distribution-image@opensuse
@@ -124,22 +130,22 @@ build-rsvg-opensuse@x86_64.stable:
- job: check
artifacts: false
-build-rsvg-opensuse@x86_64.minimum:
+cargo test - opensuse@x86_64.minimum:
extends:
- '.container.opensuse@x86_64.minimum'
- .fdo.distribution-image@opensuse
- - .build-rsvg-no-docs
+ - .cargo-test
needs:
- job: opensuse-container@x86_64.minimum
artifacts: false
- job: check
artifacts: false
-build-rsvg-opensuse@x86_64.nightly:
+cargo test - opensuse@x86_64.nightly:
extends:
- '.container.opensuse@x86_64.nightly'
- .fdo.distribution-image@opensuse
- - .build-rsvg-no-docs
+ - .cargo-test
needs:
- job: opensuse-container@x86_64.nightly
artifacts: false
@@ -396,7 +402,7 @@ distcheck:
reference:
stage: docs
needs:
- - job: build-rsvg-opensuse@x86_64.stable
+ - job: autotools build - opensuse@x86_64.stable
artifacts: true
script:
- mkdir -p public/