From aebc3ff558936e811ab57cf9fe921766132479ed Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 28 Feb 2025 21:09:33 -0500
Subject: [PATCH] GitLab CI: move back to only 2 stages, build and osxcross
---
.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 | 2 +-
.gitlab/ci/jobs/macos-x86_64.yml | 2 +-
.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 +-
24 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39b032df87..14c36213e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,13 +11,7 @@ variables:
GIT_DEPTH: 20
stages:
- - clang
- - alpine
- - oldstable
- - stable
- - batocera
- - testing
- - win32
+ - build
- osxcross
default:
diff --git a/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml b/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
index 962f4fc54f..3a17e09333 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: alpine
+ stage: build
when: manual
diff --git a/.gitlab/ci/jobs/alpine-3-gcc.yml b/.gitlab/ci/jobs/alpine-3-gcc.yml
index 30a2dee77c..56339e3325 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: alpine
+ stage: build
when: manual
diff --git a/.gitlab/ci/jobs/batocera-arm64-makefile.yml b/.gitlab/ci/jobs/batocera-arm64-makefile.yml
index 6b729195e5..dd8f57759d 100644
--- a/.gitlab/ci/jobs/batocera-arm64-makefile.yml
+++ b/.gitlab/ci/jobs/batocera-arm64-makefile.yml
@@ -1,7 +1,7 @@
batocera:arm64 Makefile:
extends: Debian stable:arm64 Makefile
- stage: batocera
+ stage: build
when: manual
diff --git a/.gitlab/ci/jobs/batocera-arm64.yml b/.gitlab/ci/jobs/batocera-arm64.yml
index 01bebc7529..5011c4322f 100644
--- a/.gitlab/ci/jobs/batocera-arm64.yml
+++ b/.gitlab/ci/jobs/batocera-arm64.yml
@@ -1,7 +1,7 @@
batocera:arm64:
extends: Debian stable:arm64
- stage: batocera
+ stage: build
when: manual
diff --git a/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml b/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml
index 9f54349e04..f365a79274 100644
--- a/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml
@@ -1,7 +1,7 @@
Debian oldstable:amd64 Makefile:
extends: Debian stable:amd64 Makefile
- stage: oldstable
+ stage: build
when: manual
diff --git a/.gitlab/ci/jobs/debian-oldstable-amd64.yml b/.gitlab/ci/jobs/debian-oldstable-amd64.yml
index 90f6fd7336..3989f750b9 100644
--- a/.gitlab/ci/jobs/debian-oldstable-amd64.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-amd64.yml
@@ -1,7 +1,7 @@
Debian oldstable:amd64:
extends: Debian stable:amd64
- stage: oldstable
+ stage: build
when: manual
diff --git a/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml b/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml
index 4009fee3fb..25782baf23 100644
--- a/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml
@@ -1,7 +1,7 @@
Debian oldstable:arm64 Makefile:
extends: Debian stable:arm64 Makefile
- stage: oldstable
+ stage: build
when: manual
diff --git a/.gitlab/ci/jobs/debian-oldstable-arm64.yml b/.gitlab/ci/jobs/debian-oldstable-arm64.yml
index 75b5631998..db0e7f861d 100644
--- a/.gitlab/ci/jobs/debian-oldstable-arm64.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-arm64.yml
@@ -1,7 +1,7 @@
Debian oldstable:arm64:
extends: Debian stable:arm64
- stage: oldstable
+ stage: build
when: manual
diff --git a/.gitlab/ci/jobs/debian-stable-amd64-makefile.yml b/.gitlab/ci/jobs/debian-stable-amd64-makefile.yml
index 5d30dfe021..fee52c5a79 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: stable
+ stage: build
artifacts:
paths:
diff --git a/.gitlab/ci/jobs/debian-stable-amd64.yml b/.gitlab/ci/jobs/debian-stable-amd64.yml
index 7377cfe1d6..e58f5a112c 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: stable
+ stage: build
artifacts:
paths:
diff --git a/.gitlab/ci/jobs/debian-stable-arm64-makefile.yml b/.gitlab/ci/jobs/debian-stable-arm64-makefile.yml
index b00ebe7e0b..aa0ea3780b 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: stable
+ stage: build
when: manual
diff --git a/.gitlab/ci/jobs/debian-stable-arm64.yml b/.gitlab/ci/jobs/debian-stable-arm64.yml
index d3446cd775..135d87aa59 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: stable
+ stage: build
when: manual
diff --git a/.gitlab/ci/jobs/debian-stable-clang-amd64.yml b/.gitlab/ci/jobs/debian-stable-clang-amd64.yml
index 2a7704ed97..870e96bc7a 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: clang
+ stage: build
when: on_success
diff --git a/.gitlab/ci/jobs/debian-stable-i386-makefile.yml b/.gitlab/ci/jobs/debian-stable-i386-makefile.yml
index acf757556c..dd572ec383 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: stable
+ stage: build
when: manual
diff --git a/.gitlab/ci/jobs/debian-stable-i386.yml b/.gitlab/ci/jobs/debian-stable-i386.yml
index ff3dbface6..970b92a69c 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: stable
+ stage: build
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 e3cc092568..1165b1fea3 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: testing
+ stage: build
when: manual
diff --git a/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml b/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml
index fbad8dfb36..fc998ea47b 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: testing
+ stage: build
when: manual
diff --git a/.gitlab/ci/jobs/macos-arm64.yml b/.gitlab/ci/jobs/macos-arm64.yml
index 7750254674..476bb6abad 100644
--- a/.gitlab/ci/jobs/macos-arm64.yml
+++ b/.gitlab/ci/jobs/macos-arm64.yml
@@ -1,7 +1,7 @@
osxcross arm64:
extends: .srb2ci
- stage: osxcross
+ stage: build
artifacts:
paths:
diff --git a/.gitlab/ci/jobs/macos-x86_64.yml b/.gitlab/ci/jobs/macos-x86_64.yml
index 5f59f5cd71..cc9749e9ae 100644
--- a/.gitlab/ci/jobs/macos-x86_64.yml
+++ b/.gitlab/ci/jobs/macos-x86_64.yml
@@ -1,7 +1,7 @@
osxcross x86_64:
extends: .srb2ci
- stage: osxcross
+ stage: build
artifacts:
paths:
diff --git a/.gitlab/ci/jobs/windows-x64-makefile.yml b/.gitlab/ci/jobs/windows-x64-makefile.yml
index 8fdc530739..8da30d2b98 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: win32
+ stage: build
when: manual
diff --git a/.gitlab/ci/jobs/windows-x64.yml b/.gitlab/ci/jobs/windows-x64.yml
index 70af9401b0..abb5ec3e3e 100644
--- a/.gitlab/ci/jobs/windows-x64.yml
+++ b/.gitlab/ci/jobs/windows-x64.yml
@@ -1,7 +1,7 @@
Windows x64:
extends: .srb2ci
- stage: win32
+ stage: build
when: manual
diff --git a/.gitlab/ci/jobs/windows-x86-makefile.yml b/.gitlab/ci/jobs/windows-x86-makefile.yml
index d81baf2f12..213342cda8 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: win32
+ stage: build
when: on_success
diff --git a/.gitlab/ci/jobs/windows-x86.yml b/.gitlab/ci/jobs/windows-x86.yml
index a7d0136499..195c1aab15 100644
--- a/.gitlab/ci/jobs/windows-x86.yml
+++ b/.gitlab/ci/jobs/windows-x86.yml
@@ -1,7 +1,7 @@
Windows x86:
extends: .srb2ci
- stage: win32
+ stage: build
cache:
- key: ccache-$CI_JOB_NAME_SLUG-$CI_COMMIT_REF_SLUG
--
GitLab