From 6ae7ba586772cfdd0d063ad1dce9b0aa6798ae86 Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Thu, 9 Jan 2025 20:53:41 -0500 Subject: [PATCH] GitLab CI: move SH4 job to thier own file --- .gitlab-ci.yml | 33 ----------------------- .gitlab/ci/jobs/debian-stable-sh4.yml | 39 +++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 33 deletions(-) create mode 100644 .gitlab/ci/jobs/debian-stable-sh4.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8c6f5e53b..29f5ef5ff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,36 +17,3 @@ default: interruptible: true artifacts: expire_in: 1 day - - -Debian stable:sh4: - stage: build - - when: manual - - allow_failure: true - - artifacts: - name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-sh4" - - variables: - CC: sh4-linux-gnu-gcc - WFLAGS: -Wno-cast-align - CFLAGS: -Wno-cast-align - - script: - - - | - # apt_toolchain - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" - - apt-get install gcc-sh4-linux-gnu - - | - # apt_toolchain - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" - - - - | - # make - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" - - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 SDL=0 NOHW=1 NOZLIB=1 NOCURL=1 NOGME=1 NOOPENMPT=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 SDL=0 NOHW=1 NOZLIB=1 NOCURL=1 NOGME=1 NOOPENMPT=1 - - | - # make - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" diff --git a/.gitlab/ci/jobs/debian-stable-sh4.yml b/.gitlab/ci/jobs/debian-stable-sh4.yml new file mode 100644 index 000000000..a0bb989af --- /dev/null +++ b/.gitlab/ci/jobs/debian-stable-sh4.yml @@ -0,0 +1,39 @@ +Debian stable:sh4: + extends: .srb2ci + + stage: build + + when: manual + + allow_failure: true + + artifacts: + paths: + - "bin/" + - "src/comptime.h" + expose_as: "Debian arm64" + name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-sh4" + + variables: + CC: sh4-linux-gnu-gcc + OBJCOPY: sh4-linux-gnu-objcopy + OBJDUMP: sh4-linux-gnu-objdump + WFLAGS: -Wno-cast-align + CFLAGS: -Wno-cast-align + + script: + - - | + # apt_toolchain + echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" + - apt-get install gcc-sh4-linux-gnu + - | + # apt_toolchain + echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" + + - - | + # make + echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" + - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 SDL=0 NOHW=1 NOZLIB=1 NOCURL=1 NOGME=1 NOOPENMPT=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 SDL=0 NOHW=1 NOZLIB=1 NOCURL=1 NOGME=1 NOOPENMPT=1 + - | + # make + echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"