From 04ca7010f064c5c1da1cfd3ca0da576b9c1f1fe8 Mon Sep 17 00:00:00 2001
From: Neo <11726174-neo.nomadic@users.noreply.gitlab.com>
Date: Mon, 21 Nov 2022 17:33:21 +0000
Subject: [PATCH] CI: revert MR 6447

---
 .gitlab/ci/jobs/build/docker_amd64_release.yml       | 2 --
 .gitlab/ci/jobs/build/get_contracts.yml              | 2 --
 .gitlab/ci/jobs/build/static_x86_64_experimental.yml | 2 --
 .gitlab/ci/jobs/build/static_x86_64_release.yml      | 2 --
 .gitlab/ci/jobs/build/x86_64.yml                     | 2 --
 scripts/ci/build_full_unreleased.sh                  | 4 ++--
 scripts/ci/build_static_binaries.sh                  | 3 ---
 7 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/.gitlab/ci/jobs/build/docker_amd64_release.yml b/.gitlab/ci/jobs/build/docker_amd64_release.yml
index f3a5fe66e3ef..dc669c5cec3e 100644
--- a/.gitlab/ci/jobs/build/docker_amd64_release.yml
+++ b/.gitlab/ci/jobs/build/docker_amd64_release.yml
@@ -7,5 +7,3 @@ docker:amd64:
     IMAGE_ARCH_PREFIX: "amd64_"
     CI_DOCKER_HUB: "true"
   stage: build
-  tags:
-    - build_dedicated
diff --git a/.gitlab/ci/jobs/build/get_contracts.yml b/.gitlab/ci/jobs/build/get_contracts.yml
index 2350e417e8d8..2d029b09fe4b 100644
--- a/.gitlab/ci/jobs/build/get_contracts.yml
+++ b/.gitlab/ci/jobs/build/get_contracts.yml
@@ -5,5 +5,3 @@ build_get_contracts:
     - .build_template
   script:
     - dune build @devtools/get_contracts/check
-  tags:
-    - build_dedicated
diff --git a/.gitlab/ci/jobs/build/static_x86_64_experimental.yml b/.gitlab/ci/jobs/build/static_x86_64_experimental.yml
index b88d3c049274..475930848e82 100644
--- a/.gitlab/ci/jobs/build/static_x86_64_experimental.yml
+++ b/.gitlab/ci/jobs/build/static_x86_64_experimental.yml
@@ -20,5 +20,3 @@ build:static-x86_64-linux-binaries:
   variables:
     ARCH: "x86_64"
     EXECUTABLE_FILES: "script-inputs/released-executables script-inputs/experimental-executables"
-  tags:
-    - build_dedicated
diff --git a/.gitlab/ci/jobs/build/static_x86_64_release.yml b/.gitlab/ci/jobs/build/static_x86_64_release.yml
index 2a37903cd72d..181fde405096 100644
--- a/.gitlab/ci/jobs/build/static_x86_64_release.yml
+++ b/.gitlab/ci/jobs/build/static_x86_64_release.yml
@@ -8,5 +8,3 @@ build:static-x86_64-linux-binaries:
   variables:
     ARCH: "x86_64"
     EXECUTABLE_FILES: "script-inputs/released-executables"
-  tags:
-    - build_dedicated
diff --git a/.gitlab/ci/jobs/build/x86_64.yml b/.gitlab/ci/jobs/build/x86_64.yml
index d472507c88a4..70918fd9280d 100644
--- a/.gitlab/ci/jobs/build/x86_64.yml
+++ b/.gitlab/ci/jobs/build/x86_64.yml
@@ -8,5 +8,3 @@ build_x86_64:
   needs: [trigger]
   variables:
     ARCH: "x86_64"
-  tags:
-    - build_dedicated
diff --git a/scripts/ci/build_full_unreleased.sh b/scripts/ci/build_full_unreleased.sh
index f67e4d5a7a56..0cc81049a494 100755
--- a/scripts/ci/build_full_unreleased.sh
+++ b/scripts/ci/build_full_unreleased.sh
@@ -27,5 +27,5 @@ make build-unreleased
 # shellcheck disable=SC2086
 dune build ${COVERAGE_OPTIONS} src/bin_tps_evaluation
 
-# Trim the dune cache, if used.
-dune cache trim --size=250GB
+# 4. clean-up caches before uploading the cache
+opam clean
\ No newline at end of file
diff --git a/scripts/ci/build_static_binaries.sh b/scripts/ci/build_static_binaries.sh
index 6a235a18afb8..c264344ebd26 100755
--- a/scripts/ci/build_static_binaries.sh
+++ b/scripts/ci/build_static_binaries.sh
@@ -22,9 +22,6 @@ mkdir -pv "octez-binaries/$ARCH"
 echo "Build and install static binaries"
 make static
 
-# Trim the dune cache, if used.
-dune cache trim --size=250GB
-
 echo "Check executables and move them to the destination directory"
 # Disable https://www.shellcheck.net/wiki/SC2086 because:
 # - it's meant to prevent word splitting and we actually want to split words
-- 
GitLab