From 8f063c99d51deef5d35296555b7b1028a610fc1c Mon Sep 17 00:00:00 2001
From: Jonas Zohren <git-pbkyr@jzohren.de>
Date: Fri, 18 Feb 2022 22:29:55 +0100
Subject: [PATCH 1/2] chore(ci): Split up tests

---
 .gitlab-ci.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd4ce791..8660f4ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -238,7 +238,7 @@ docker:tags:dockerhub:
 #  Run tests                                                            #
 # --------------------------------------------------------------------- #
 
-test:cargo:
+.test-shared-settings:
   stage: "test"
   needs: []
   image: "registry.gitlab.com/jfowl/conduit-containers/rust-with-tools:latest"
@@ -246,13 +246,15 @@ test:cargo:
   variables:
     CARGO_INCREMENTAL: "false" # https://matklad.github.io/2021/09/04/fast-rust-builds.html#ci-workflow
   interruptible: true
+
+test:cargo:
+  extends: .test-shared-settings
   before_script:
-    - rustup component add clippy rustfmt
+    - rustup component add clippy
     # If provided, bring in caching through sccache, which uses an external S3 endpoint to store compilation results:
     - if [ -n "${SCCACHE_ENDPOINT}" ]; then export RUSTC_WRAPPER=/usr/local/cargo/bin/sccache; fi
   script:
     - rustc --version && cargo --version # Print version info for debugging
-    - cargo fmt --all -- --check
     - "cargo test --color always --workspace --verbose --locked --no-fail-fast -- -Z unstable-options --format json | gitlab-report -p test > $CI_PROJECT_DIR/report.xml"
     - "cargo clippy --color always --verbose --message-format=json | gitlab-report -p clippy > $CI_PROJECT_DIR/gl-code-quality-report.json"
   artifacts:
@@ -261,6 +263,13 @@ test:cargo:
       junit: report.xml
       codequality: gl-code-quality-report.json
 
+test:format:
+  extends: .test-shared-settings
+  before_script:
+    - rustup component add rustfmt
+  script:
+    - cargo fmt --all -- --check
+
 test:sytest:
   stage: "test"
   allow_failure: true

From ad6eb92bbd38889c196d02a5af15313679e7d7cb Mon Sep 17 00:00:00 2001
From: Jonas Zohren <git-pbkyr@jzohren.de>
Date: Fri, 18 Feb 2022 22:30:02 +0100
Subject: [PATCH 2/2] feat(ci): Add dependency audit to CI tests

---
 .gitlab-ci.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8660f4ee..3d321b4a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -270,6 +270,17 @@ test:format:
   script:
     - cargo fmt --all -- --check
 
+test:audit:
+  extends: .test-shared-settings
+  allow_failure: true
+  script:
+    - cargo audit --color always || true
+    - cargo audit --stale --json | gitlab-report -p audit > gl-sast-report.json
+  artifacts:
+    when: always
+    reports:
+      sast: gl-sast-report.json
+
 test:sytest:
   stage: "test"
   allow_failure: true