2025-03-13 06:13:18 +00:00 · 2025-02-26 21:55:14 -05:00 · 2025-02-26 21:55:14 -05:00 · c7801bdf6d
commit c7801bdf6d
parent 7cbec73971
23 changed files with 35 additions and 18 deletions
--- 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:
--- 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

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

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

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

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

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

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

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

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

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

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

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

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