From 646fb3bb068ff287c4a7d30d1bc3d470f258ec43 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Wed, 28 Feb 2024 21:04:09 +0100
Subject: [PATCH] ci(earthly): Reorganise earthly includes
---
docs/.gitlab-ci.yaml | 4 ++--
images/.utils/gitlab-ci.yaml | 13 +++++--------
shared/earthly/gitlab-earthly-cloud.yaml | 8 ++++++++
.../.utils => shared/earthly}/gitlab-earthly.yaml | 0
4 files changed, 15 insertions(+), 10 deletions(-)
create mode 100644 shared/earthly/gitlab-earthly-cloud.yaml
rename {images/.utils => shared/earthly}/gitlab-earthly.yaml (100%)
diff --git a/docs/.gitlab-ci.yaml b/docs/.gitlab-ci.yaml
index 282a38fa6..deda5565c 100644
--- a/docs/.gitlab-ci.yaml
+++ b/docs/.gitlab-ci.yaml
@@ -1,11 +1,11 @@
include:
- - local: 'images/.utils/gitlab-earthly.yaml'
+ - local: 'shared/earthly/gitlab-earthly-cloud.yaml'
stages:
- build
lint-docs:
- extends: .earthly
+ extends: .earthly-cloud
stage: lint
script:
- earthly --ci +docs-lint
diff --git a/images/.utils/gitlab-ci.yaml b/images/.utils/gitlab-ci.yaml
index 5c0487ed4..c3d8c9ceb 100644
--- a/images/.utils/gitlab-ci.yaml
+++ b/images/.utils/gitlab-ci.yaml
@@ -1,10 +1,7 @@
+include:
+ - local: 'shared/earthly/gitlab-earthly-cloud.yaml'
+
container-build:
- stage: build
- image: earthly/earthly:v0.8.3
- variables:
- FORCE_COLOR: 1
- EARTHLY_EXEC_CMD: "/bin/sh"
+ extends: .earthly-cloud
script:
- - earthly --org earthly-5846 --sat sat01 --ci --push -P +images
- tags:
- - kubernetes
\ No newline at end of file
+ - earthly --use-inline-cache --save-inline-cache --ci --push +images
\ No newline at end of file
diff --git a/shared/earthly/gitlab-earthly-cloud.yaml b/shared/earthly/gitlab-earthly-cloud.yaml
new file mode 100644
index 000000000..8b984aa63
--- /dev/null
+++ b/shared/earthly/gitlab-earthly-cloud.yaml
@@ -0,0 +1,8 @@
+.earthly-cloud:
+ stage: build
+ image: docker.io/earthly/earthly:v0.8.4@sha256:32e08fabd79f39bd58a76250c8801f6879540404bfea89eeb548414672fb607b
+ variables:
+ FORCE_COLOR: 1
+ EARTHLY_EXEC_CMD: "/bin/sh"
+ tags:
+ - kubernetes
\ No newline at end of file
diff --git a/images/.utils/gitlab-earthly.yaml b/shared/earthly/gitlab-earthly.yaml
similarity index 100%
rename from images/.utils/gitlab-earthly.yaml
rename to shared/earthly/gitlab-earthly.yaml
--
GitLab