From aebc3ff558936e811ab57cf9fe921766132479ed Mon Sep 17 00:00:00 2001 From: Alam Ed Arias 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 39b032df8..14c36213e 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 962f4fc54..3a17e0933 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 30a2dee77..56339e332 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 6b729195e..dd8f57759 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 01bebc752..5011c4322 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 9f54349e0..f365a7927 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 90f6fd733..3989f750b 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 4009fee3f..25782baf2 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 75b563199..db0e7f861 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 5d30dfe02..fee52c5a7 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 7377cfe1d..e58f5a112 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 b00ebe7e0..aa0ea3780 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 d3446cd77..135d87aa5 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 2a7704ed9..870e96bc7 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 acf757556..dd572ec38 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 ff3dbface..970b92a69 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 e3cc09256..1165b1fea 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 fbad8dfb3..fc998ea47 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 775025467..476bb6aba 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 5f59f5cd7..cc9749e9a 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 8fdc53073..8da30d2b9 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 70af9401b..abb5ec3e3 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 d81baf2f1..213342cda 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 a7d013649..195c1aab1 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