From ae4e95777aab5c8fb1ccf22e3780bc3e0dd578b9 Mon Sep 17 00:00:00 2001
From: Eidolon <furyhunter600@gmail.com>
Date: Thu, 16 May 2024 17:52:26 -0500
Subject: [PATCH] Put the apt-cache in build/
Like with ccache, we want to make sure the git checkout is considered
clean during build.
---
.gitlab/ci/jobs/macos-x86_64.yml | 2 +-
.gitlab/ci/jobs/windows-x86.yml | 2 +-
.gitlab/ci/templates/srb2ci.yml | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab/ci/jobs/macos-x86_64.yml b/.gitlab/ci/jobs/macos-x86_64.yml
index b5a565ea7b..d469b54f97 100644
--- a/.gitlab/ci/jobs/macos-x86_64.yml
+++ b/.gitlab/ci/jobs/macos-x86_64.yml
@@ -14,7 +14,7 @@ osxcross x86_64:
- key: apt-$CI_JOB_IMAGE
paths:
- - apt-cache
+ - build/apt-cache
unprotect: true
- key: vcpkg-root
diff --git a/.gitlab/ci/jobs/windows-x86.yml b/.gitlab/ci/jobs/windows-x86.yml
index 9704f3c3fb..6c203eb5c0 100644
--- a/.gitlab/ci/jobs/windows-x86.yml
+++ b/.gitlab/ci/jobs/windows-x86.yml
@@ -16,7 +16,7 @@ Windows x86:
- key: apt-$CI_JOB_IMAGE
paths:
- - apt-cache
+ - build/apt-cache
unprotect: true
- key: vcpkg-root
diff --git a/.gitlab/ci/templates/srb2ci.yml b/.gitlab/ci/templates/srb2ci.yml
index f705a52a97..3716d9df92 100644
--- a/.gitlab/ci/templates/srb2ci.yml
+++ b/.gitlab/ci/templates/srb2ci.yml
@@ -12,7 +12,7 @@
- key: apt-$CI_JOB_IMAGE
paths:
- - apt-cache
+ - build/apt-cache
unprotect: true
before_script:
@@ -37,7 +37,7 @@
- - |
# apt_conf
echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf"
- - export APT_CACHE_DIR=`pwd`/apt-cache
+ - export APT_CACHE_DIR=$CI_PROJECT_DIR/build/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
- touch /etc/apt/apt.conf.d/99build
- |
--
GitLab