From c7801bdf6d915f80a4e3a53a746554305470a864 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 26 Feb 2025 21:55:14 -0500
Subject: [PATCH] GitLab CI: move around stages
---
.gitlab-ci.yml | 8 +++++++-
.gitlab/ci/jobs/alpine-3-gcc-makefile.yml | 2 +-
.gitlab/ci/jobs/alpine-3-gcc.yml | 2 +-
.gitlab/ci/jobs/batocera-arm64-makefile.yml | 2 ++
.gitlab/ci/jobs/batocera-arm64.yml | 2 ++
.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml | 2 ++
.gitlab/ci/jobs/debian-oldstable-amd64.yml | 2 ++
.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml | 2 ++
.gitlab/ci/jobs/debian-oldstable-arm64.yml | 2 ++
.gitlab/ci/jobs/debian-stable-amd64-makefile.yml | 2 +-
.gitlab/ci/jobs/debian-stable-amd64.yml | 2 +-
.gitlab/ci/jobs/debian-stable-arm64-makefile.yml | 2 +-
.gitlab/ci/jobs/debian-stable-arm64.yml | 2 +-
.gitlab/ci/jobs/debian-stable-clang-amd64.yml | 2 +-
.gitlab/ci/jobs/debian-stable-i386-makefile.yml | 2 +-
.gitlab/ci/jobs/debian-stable-i386.yml | 2 +-
.gitlab/ci/jobs/debian-testing-gcc-amd64-makefile.yml | 2 +-
.gitlab/ci/jobs/debian-testing-gcc-amd64.yml | 2 +-
.gitlab/ci/jobs/macos-arm64.yml | 3 +--
.gitlab/ci/jobs/windows-x64-makefile.yml | 2 +-
.gitlab/ci/jobs/windows-x64.yml | 2 +-
.gitlab/ci/jobs/windows-x86-makefile.yml | 2 +-
.gitlab/ci/jobs/windows-x86.yml | 2 +-
23 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14c36213e0..39b032df87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,13 @@ variables:
GIT_DEPTH: 20
stages:
- - build
+ - clang
+ - alpine
+ - oldstable
+ - stable
+ - batocera
+ - testing
+ - win32
- osxcross
default:
diff --git a/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml b/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
index 3a17e09333..962f4fc54f 100644
--- a/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
+++ b/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
@@ -1,5 +1,5 @@
Alpine 3 GCC Makefile:
- stage: build
+ stage: alpine
when: manual
diff --git a/.gitlab/ci/jobs/alpine-3-gcc.yml b/.gitlab/ci/jobs/alpine-3-gcc.yml
index 56339e3325..30a2dee77c 100644
--- a/.gitlab/ci/jobs/alpine-3-gcc.yml
+++ b/.gitlab/ci/jobs/alpine-3-gcc.yml
@@ -1,5 +1,5 @@
Alpine 3 GCC:
- stage: build
+ stage: alpine
when: manual
diff --git a/.gitlab/ci/jobs/batocera-arm64-makefile.yml b/.gitlab/ci/jobs/batocera-arm64-makefile.yml
index e02497d40d..6b729195e5 100644
--- a/.gitlab/ci/jobs/batocera-arm64-makefile.yml
+++ b/.gitlab/ci/jobs/batocera-arm64-makefile.yml
@@ -1,6 +1,8 @@
batocera:arm64 Makefile:
extends: Debian stable:arm64 Makefile
+ stage: batocera
+
when: manual
allow_failure: true
diff --git a/.gitlab/ci/jobs/batocera-arm64.yml b/.gitlab/ci/jobs/batocera-arm64.yml
index 3dcd73a0e2..01bebc7529 100644
--- a/.gitlab/ci/jobs/batocera-arm64.yml
+++ b/.gitlab/ci/jobs/batocera-arm64.yml
@@ -1,6 +1,8 @@
batocera:arm64:
extends: Debian stable:arm64
+ stage: batocera
+
when: manual
allow_failure: true
diff --git a/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml b/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml
index bd4a927419..9f54349e04 100644
--- a/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml
@@ -1,6 +1,8 @@
Debian oldstable:amd64 Makefile:
extends: Debian stable:amd64 Makefile
+ stage: oldstable
+
when: manual
image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:oldstable
diff --git a/.gitlab/ci/jobs/debian-oldstable-amd64.yml b/.gitlab/ci/jobs/debian-oldstable-amd64.yml
index 231e8485d7..90f6fd7336 100644
--- a/.gitlab/ci/jobs/debian-oldstable-amd64.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-amd64.yml
@@ -1,6 +1,8 @@
Debian oldstable:amd64:
extends: Debian stable:amd64
+ stage: oldstable
+
when: manual
image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:oldstable
diff --git a/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml b/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml
index 426934bf97..4009fee3fb 100644
--- a/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml
@@ -1,6 +1,8 @@
Debian oldstable:arm64 Makefile:
extends: Debian stable:arm64 Makefile
+ stage: oldstable
+
when: manual
image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:oldstable
diff --git a/.gitlab/ci/jobs/debian-oldstable-arm64.yml b/.gitlab/ci/jobs/debian-oldstable-arm64.yml
index 76d401309d..75b5631998 100644
--- a/.gitlab/ci/jobs/debian-oldstable-arm64.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-arm64.yml
@@ -1,6 +1,8 @@
Debian oldstable:arm64:
extends: Debian stable:arm64
+ stage: oldstable
+
when: manual
image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:oldstable
diff --git a/.gitlab/ci/jobs/debian-stable-amd64-makefile.yml b/.gitlab/ci/jobs/debian-stable-amd64-makefile.yml
index fee52c5a79..5d30dfe021 100644
--- a/.gitlab/ci/jobs/debian-stable-amd64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-stable-amd64-makefile.yml
@@ -1,7 +1,7 @@
Debian stable:amd64 Makefile:
extends: .srb2ci
- stage: build
+ stage: stable
artifacts:
paths:
diff --git a/.gitlab/ci/jobs/debian-stable-amd64.yml b/.gitlab/ci/jobs/debian-stable-amd64.yml
index e58f5a112c..7377cfe1d6 100644
--- a/.gitlab/ci/jobs/debian-stable-amd64.yml
+++ b/.gitlab/ci/jobs/debian-stable-amd64.yml
@@ -1,7 +1,7 @@
Debian stable:amd64:
extends: .srb2ci
- stage: build
+ stage: stable
artifacts:
paths:
diff --git a/.gitlab/ci/jobs/debian-stable-arm64-makefile.yml b/.gitlab/ci/jobs/debian-stable-arm64-makefile.yml
index aa0ea3780b..b00ebe7e0b 100644
--- a/.gitlab/ci/jobs/debian-stable-arm64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-stable-arm64-makefile.yml
@@ -1,7 +1,7 @@
Debian stable:arm64 Makefile:
extends: .srb2ci
- stage: build
+ stage: stable
when: manual
diff --git a/.gitlab/ci/jobs/debian-stable-arm64.yml b/.gitlab/ci/jobs/debian-stable-arm64.yml
index 135d87aa59..d3446cd775 100644
--- a/.gitlab/ci/jobs/debian-stable-arm64.yml
+++ b/.gitlab/ci/jobs/debian-stable-arm64.yml
@@ -1,7 +1,7 @@
Debian stable:arm64:
extends: .srb2ci
- stage: build
+ stage: stable
when: manual
diff --git a/.gitlab/ci/jobs/debian-stable-clang-amd64.yml b/.gitlab/ci/jobs/debian-stable-clang-amd64.yml
index 0b8e6e50ce..1296a33472 100644
--- a/.gitlab/ci/jobs/debian-stable-clang-amd64.yml
+++ b/.gitlab/ci/jobs/debian-stable-clang-amd64.yml
@@ -1,7 +1,7 @@
Debian stable Clang:
extends: .srb2ci
- stage: build
+ stage: clang
when: on_success
diff --git a/.gitlab/ci/jobs/debian-stable-i386-makefile.yml b/.gitlab/ci/jobs/debian-stable-i386-makefile.yml
index dd572ec383..acf757556c 100644
--- a/.gitlab/ci/jobs/debian-stable-i386-makefile.yml
+++ b/.gitlab/ci/jobs/debian-stable-i386-makefile.yml
@@ -1,7 +1,7 @@
Debian stable:i386 Makefile:
extends: .srb2ci
- stage: build
+ stage: stable
when: manual
diff --git a/.gitlab/ci/jobs/debian-stable-i386.yml b/.gitlab/ci/jobs/debian-stable-i386.yml
index 970b92a69c..ff3dbface6 100644
--- a/.gitlab/ci/jobs/debian-stable-i386.yml
+++ b/.gitlab/ci/jobs/debian-stable-i386.yml
@@ -1,7 +1,7 @@
Debian stable:i386:
extends: .srb2ci
- stage: build
+ stage: stable
when: manual
diff --git a/.gitlab/ci/jobs/debian-testing-gcc-amd64-makefile.yml b/.gitlab/ci/jobs/debian-testing-gcc-amd64-makefile.yml
index 1165b1fea3..e3cc092568 100644
--- a/.gitlab/ci/jobs/debian-testing-gcc-amd64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-testing-gcc-amd64-makefile.yml
@@ -1,7 +1,7 @@
Debian testing GCC Makefile:
extends: .srb2ci
- stage: build
+ stage: testing
when: manual
diff --git a/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml b/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml
index fc998ea47b..fbad8dfb36 100644
--- a/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml
+++ b/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml
@@ -1,7 +1,7 @@
Debian testing GCC:
extends: .srb2ci
- stage: build
+ stage: testing
when: manual
diff --git a/.gitlab/ci/jobs/macos-arm64.yml b/.gitlab/ci/jobs/macos-arm64.yml
index 1c89000c2f..6067444e86 100644
--- a/.gitlab/ci/jobs/macos-arm64.yml
+++ b/.gitlab/ci/jobs/macos-arm64.yml
@@ -1,14 +1,13 @@
osxcross arm64:
extends: .srb2ci
- stage: build
+ stage: osxcross
artifacts:
paths:
- "build.arm64/bin/"
- "build.arm64/dist/arm64.h"
- "build.arm64/src/config.h"
- expose_as: "Mac arm64"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-arm64-apple-darwin21.4"
variables:
diff --git a/.gitlab/ci/jobs/windows-x64-makefile.yml b/.gitlab/ci/jobs/windows-x64-makefile.yml
index 8da30d2b98..8fdc530739 100644
--- a/.gitlab/ci/jobs/windows-x64-makefile.yml
+++ b/.gitlab/ci/jobs/windows-x64-makefile.yml
@@ -1,7 +1,7 @@
Windows x64 Makefile:
extends: .srb2ci
- stage: build
+ stage: win32
when: manual
diff --git a/.gitlab/ci/jobs/windows-x64.yml b/.gitlab/ci/jobs/windows-x64.yml
index 36f12e308d..b440970445 100644
--- a/.gitlab/ci/jobs/windows-x64.yml
+++ b/.gitlab/ci/jobs/windows-x64.yml
@@ -1,7 +1,7 @@
Windows x64:
extends: .srb2ci
- stage: build
+ stage: win32
when: manual
diff --git a/.gitlab/ci/jobs/windows-x86-makefile.yml b/.gitlab/ci/jobs/windows-x86-makefile.yml
index 213342cda8..d81baf2f12 100644
--- a/.gitlab/ci/jobs/windows-x86-makefile.yml
+++ b/.gitlab/ci/jobs/windows-x86-makefile.yml
@@ -1,7 +1,7 @@
Windows x86 Makefile:
extends: .srb2ci
- stage: build
+ stage: win32
when: on_success
diff --git a/.gitlab/ci/jobs/windows-x86.yml b/.gitlab/ci/jobs/windows-x86.yml
index 7a298731d1..22b799cda0 100644
--- a/.gitlab/ci/jobs/windows-x86.yml
+++ b/.gitlab/ci/jobs/windows-x86.yml
@@ -1,7 +1,7 @@
Windows x86:
extends: .srb2ci
- stage: build
+ stage: win32
cache:
- key: ccache-$CI_JOB_NAME_SLUG-$CI_COMMIT_REF_SLUG
--
GitLab