2025-03-13 06:13:18 +00:00 · 2025-02-28 21:09:33 -05:00 · 2025-02-28 21:09:33 -05:00 · aebc3ff558
commit aebc3ff558
parent fc7768fad9
24 changed files with 24 additions and 30 deletions
--- 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:
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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:
--- 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:
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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:
--- 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:
--- 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

--- 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

--- 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

--- 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