From 9576d06da91f5accfacd55fb935c4e4798cd6383 Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Sat, 20 Mar 2021 04:06:32 -0400
Subject: [PATCH] Disable CI that does not need to run for builds

---
 .gitlab-ci.yml                 |   6 +-
 .gitlab/CI/build.gitlab-ci.yml | 102 ++++++++++++++++-----------------
 .gitlab/CI/check.gitlab-ci.yml |  14 ++---
 3 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d7195ed2a..a54c2dc633 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ variables:
   # Note: this is deprecated!
   # ttps://docs.gitlab.com/ee/ci/yaml/#shallow-cloning
   GIT_DEPTH: 3
-  GIT_CLEAN_FLAGS: -f
+  GIT_CLEAN_FLAGS: -n
 
 default:
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache:e134e812
@@ -32,8 +32,8 @@ before_script:
   - export DISABLE_GIT_LFS_CHECK=true
   - export VELOREN_ASSETS="$(pwd)/assets"
   - echo "VELOREN_ASSETS=$VELOREN_ASSETS"
-  - export RUSTFLAGS="-D warnings"
-  - rm -rf target || echo "it seems that sometimes OLD data is left over"
+    #- export RUSTFLAGS="-D warnings"
+    #- rm -rf target || echo "it seems that sometimes OLD data is left over"
 
 workflow:
   rules:
diff --git a/.gitlab/CI/build.gitlab-ci.yml b/.gitlab/CI/build.gitlab-ci.yml
index fd272f2f06..1bf3d0a1de 100644
--- a/.gitlab/CI/build.gitlab-ci.yml
+++ b/.gitlab/CI/build.gitlab-ci.yml
@@ -1,54 +1,54 @@
-unittests:
-  extends: .recompile-branch
-  stage: build
-  variables:
-    GIT_DEPTH: 9999999999999
-  script:
-    - ln -s /dockercache/cache-all target
-    - rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
-    - cargo test --package veloren-voxygen --lib test_all_localizations -- --nocapture --ignored
-    - rm -r target/debug/incremental* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
-    - cargo test
-  retry:
-    max: 2
-
-benchmarks:
-  extends: .post-merge
-  stage: build
-  tags:
-    - veloren-benchmark
-  script:
-    - unset DISABLE_GIT_LFS_CHECK
-    - ln -s /dockercache/cache-all target
-    - ls -la target/*
-    - rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
-    - rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
-    - cargo bench || exit 0 #temp fix
-    - TAGUUID="Z$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1)" || echo "ignore this returncode, dont ask me why, it works"
-    - echo $TAGUUID
-    - echo 'SET veloren.timestamp = "'"$(git show --no-patch --no-notes --pretty='%cd' HEAD)"'";' > upload.sql
-    - echo "SET veloren.branch = \$${TAGUUID}\$${CI_COMMIT_REF_NAME}\$${TAGUUID}\$;" >> upload.sql
-    - echo "SET veloren.sha = \$${TAGUUID}\$${CI_COMMIT_SHA}\$${TAGUUID}\$;" >> upload.sql
-    - find target/criterion -wholename "*new/*.csv" -exec echo '\copy benchmarks ("group", "function", "value", throughput_num, throughput_type, sample_measured_value, unit, iteration_count) from '"'{}' csv header" >> upload.sql \;
-    - cat upload.sql
-    - PGPASSWORD="${CIDBPASSWORD}" PGSSLROOTCERT="./.gitlab/ci-db.crt" psql "sslmode=verify-ca host=auth.veloren.net dbname=benchmarks" -U bsdrftsejrhdrjhgd -f upload.sql;
-  retry:
-    max: 2
-
-# Coverage is needed on master for the README.md badge to work
-# tmp remove simd as it doesnt work with tarpaulin: https://github.com/rust-lang/rust/issues/77529
-coverage:
-  extends: .post-merge
-  stage: build
-  script:
-    - ln -s /dockercache/cache-tarpaulin target
-    - rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
-    - find ./* -name "Cargo.toml" -exec sed -i 's/, "simd"]/]/g' {} \;
-    - find ./* -name "Cargo.toml" -exec sed -i 's/"simd"]/]/g' {} \;
-    - sed -i 's/vek /#vek /g' ./Cargo.toml;
-    - cargo tarpaulin -v -- --test-threads=2
-  retry:
-    max: 2
+# unittests:
+#   extends: .recompile-branch
+#   stage: build
+#   variables:
+#     GIT_DEPTH: 9999999999999
+#   script:
+#     - ln -s /dockercache/cache-all target
+#     - rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
+#     - cargo test --package veloren-voxygen --lib test_all_localizations -- --nocapture --ignored
+#     - rm -r target/debug/incremental* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
+#     - cargo test
+#   retry:
+#     max: 2
+# 
+# benchmarks:
+#   extends: .post-merge
+#   stage: build
+#   tags:
+#     - veloren-benchmark
+#   script:
+#     - unset DISABLE_GIT_LFS_CHECK
+#     - ln -s /dockercache/cache-all target
+#     - ls -la target/*
+#     - rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
+#     - rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
+#     - cargo bench || exit 0 #temp fix
+#     - TAGUUID="Z$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1)" || echo "ignore this returncode, dont ask me why, it works"
+#     - echo $TAGUUID
+#     - echo 'SET veloren.timestamp = "'"$(git show --no-patch --no-notes --pretty='%cd' HEAD)"'";' > upload.sql
+#     - echo "SET veloren.branch = \$${TAGUUID}\$${CI_COMMIT_REF_NAME}\$${TAGUUID}\$;" >> upload.sql
+#     - echo "SET veloren.sha = \$${TAGUUID}\$${CI_COMMIT_SHA}\$${TAGUUID}\$;" >> upload.sql
+#     - find target/criterion -wholename "*new/*.csv" -exec echo '\copy benchmarks ("group", "function", "value", throughput_num, throughput_type, sample_measured_value, unit, iteration_count) from '"'{}' csv header" >> upload.sql \;
+#     - cat upload.sql
+#     - PGPASSWORD="${CIDBPASSWORD}" PGSSLROOTCERT="./.gitlab/ci-db.crt" psql "sslmode=verify-ca host=auth.veloren.net dbname=benchmarks" -U bsdrftsejrhdrjhgd -f upload.sql;
+#   retry:
+#     max: 2
+# 
+# # Coverage is needed on master for the README.md badge to work
+# # tmp remove simd as it doesnt work with tarpaulin: https://github.com/rust-lang/rust/issues/77529
+# coverage:
+#   extends: .post-merge
+#   stage: build
+#   script:
+#     - ln -s /dockercache/cache-tarpaulin target
+#     - rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
+#     - find ./* -name "Cargo.toml" -exec sed -i 's/, "simd"]/]/g' {} \;
+#     - find ./* -name "Cargo.toml" -exec sed -i 's/"simd"]/]/g' {} \;
+#     - sed -i 's/vek /#vek /g' ./Cargo.toml;
+#     - cargo tarpaulin -v -- --test-threads=2
+#   retry:
+#     max: 2
 
 #linux, windows, macos builds here as template
 .tlinux:
diff --git a/.gitlab/CI/check.gitlab-ci.yml b/.gitlab/CI/check.gitlab-ci.yml
index 171f72dbc5..200bdd1d5e 100644
--- a/.gitlab/CI/check.gitlab-ci.yml
+++ b/.gitlab/CI/check.gitlab-ci.yml
@@ -8,10 +8,10 @@ code-quality:
     - cargo clippy --all-targets --locked -- -D warnings
     - cargo fmt --all -- --check
 
-security:
-  extends: .recompile-branch
-  stage: check
-  allow_failure: true
-  script:
-    - ln -s /dockercache/cache-all target
-    - cargo audit
+#security:
+#extends: .recompile-branch
+#stage: check
+#allow_failure: true
+#script:
+#- ln -s /dockercache/cache-all target
+#- cargo audit