From c70895efd3139966fd106bee640d26721203ca92 Mon Sep 17 00:00:00 2001
From: Adam Shamblin <adam@vexingworkshop.com>
Date: Sat, 18 Feb 2023 16:01:01 -0700
Subject: [PATCH 1/3] Limit builds to main branch only.
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a579972..5dc646de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ before_script:
earthly:
stage: build
+ only: main
image: earthly/earthly:v0.6.30
tags:
- linux
From 42ca47bb667c176621dadd431b459078251b8895 Mon Sep 17 00:00:00 2001
From: Adam Shamblin <adam@vexingworkshop.com>
Date: Sat, 18 Feb 2023 16:02:36 -0700
Subject: [PATCH 2/3] fix typo
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5dc646de..7a33fdf6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,8 @@ before_script:
earthly:
stage: build
- only: main
+ only:
+ - main
image: earthly/earthly:v0.6.30
tags:
- linux
From 5e95f04411d4fc4251ada103bfd44dc9a3b605d5 Mon Sep 17 00:00:00 2001
From: Adam Shamblin <adam@vexingworkshop.com>
Date: Mon, 20 Feb 2023 12:14:05 -0700
Subject: [PATCH 3/3] Add merge_requests as build target, split into two
architectures
---
.gitlab-ci.yml | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7a33fdf6..0f030d97 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,17 +4,33 @@ variables:
EARTHLY_EXEC_CMD: "/bin/sh"
GIT_SUBMODULE_STRATEGY: normal
+stages:
+ - linux-amd64
+ - linux-arm64
before_script:
- earthly bootstrap
-earthly:
- stage: build
+earthly-amd64:
+ stage: linux-amd64
only:
- main
+ - merge_requests
image: earthly/earthly:v0.6.30
tags:
- linux
- amd64
script:
- - earthly --ci -P +package-linux
+ - earthly --ci -P +package-linux-amd64
+
+earthly-arm64:
+ stage: linux-arm64
+ only:
+ - main
+ - merge_requests
+ image: earthly/earthly:v0.6.30
+ tags:
+ - linux
+ - amd64
+ script:
+ - earthly --ci -P +package-linux-arm64