From dcd68addb641cbc463da7e7da89da270ae95a87f Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Wed, 24 Jan 2024 02:01:00 +0000 Subject: [PATCH 1/6] Update .gitlab-ci.yml file Add a Debian oldstable build, just with no GME support --- .gitlab-ci.yml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b99a850a01..5ce3cd0527 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -283,6 +283,49 @@ Debian stable:amd64: # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" +Debian oldstable:amd64: + extends: Debian stable:amd64 + + #stage: build + + when: manual + + image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:oldstable + + allow_failure: true + + artifacts: + paths: + - "bin/" + - "src/comptime.h" + expose_as: "Debian old amd64" + name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-old-x86-64" + + script: + - - | + # apt_toolchain + echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" + - apt-get install gcc-x86-64-linux-gnu || apt-get install gcc + - | + # apt_toolchain + echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" + + - - | + # apt_development + echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages" + - apt-get install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libopenmpt-dev:amd64 libminiupnpc-dev:amd64 + - | + # apt_development + echo -e "\e[0Ksection_end:`date +%s`:apt_development\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 LINUX64=1 NOGME=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NOGME=1 + - | + # make + echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" + Debian stable:i386: stage: build From 4d0b37223fd0c8acd31054f8f085f787c9a1f238 Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Wed, 24 Jan 2024 02:13:40 +0000 Subject: [PATCH 2/6] Update .gitlab-ci.yml file Add a Debian old build as well, just for ARM64, with no GME support --- .gitlab-ci.yml | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ce3cd0527..fdd18777b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -286,8 +286,6 @@ Debian stable:amd64: Debian oldstable:amd64: extends: Debian stable:amd64 - #stage: build - when: manual image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:oldstable @@ -413,6 +411,47 @@ Debian stable:arm64: # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" +Debian oldstable:arm64: + extends: Debian stable:arm64 + + when: manual + + image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:oldstable + + allow_failure: true + + artifacts: + paths: + - "bin/" + - "src/comptime.h" + expose_as: "Debian old arm64" + name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-old-aarch64" + + script: + - - | + # apt_toolchain + echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" + - apt-get install gcc-aarch64-linux-gnu || apt-get install gcc + - | + # apt_toolchain + echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" + + - - | + # apt_development + echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages" + - apt-get install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libopenmpt-dev:arm64 libminiupnpc-dev:arm64 + - | + # apt_development + echo -e "\e[0Ksection_end:`date +%s`:apt_development\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 LINUX64=1 ERRORMODE=1 NONX86=1 ARM64=1 NOGME=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1 ARM64=1 NOGME=1 + - | + # make + echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" + Windows x64: stage: build From d1de54dc284b418ab709bd43f25612ba187ee475 Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Wed, 24 Jan 2024 02:43:35 +0000 Subject: [PATCH 3/6] Update .gitlab-ci.yml file Old version of ccache do not have --verbose, add a fallback for that --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fdd18777b0..425b7d1d12 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -153,8 +153,8 @@ default: - - | # ccache_stats echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:" - - ccache --show-stats --verbose - - ccache --show-log-stats --verbose + - ccache --show-stats --verbose || ccache --show-stats + - ccache --show-log-stats --verbose || ccache --show-log-stats - | # ccahe_stats echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K" @@ -673,8 +673,8 @@ Alpine 3 GCC: - - | # ccache_stats echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:" - - ccache --show-stats --verbose - - ccache --show-log-stats --verbose + - ccache --show-stats --verbose || ccache --show-stats + - ccache --show-log-stats --verbose || ccache --show-log-stats - | # ccahe_stats echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K" From 083176f1c2ec3a3f2934d800689ae19ae99d80fd Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Wed, 24 Jan 2024 02:51:14 +0000 Subject: [PATCH 4/6] Update .gitlab-ci.yml file OK, very old version of ccache do not have --show-log-stats, just return code 0 --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 425b7d1d12..ce17581b03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -153,8 +153,8 @@ default: - - | # ccache_stats echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:" - - ccache --show-stats --verbose || ccache --show-stats - - ccache --show-log-stats --verbose || ccache --show-log-stats + - ccache --show-stats + - ccache --show-log-stats || true - | # ccahe_stats echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K" @@ -673,8 +673,8 @@ Alpine 3 GCC: - - | # ccache_stats echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:" - - ccache --show-stats --verbose || ccache --show-stats - - ccache --show-log-stats --verbose || ccache --show-log-stats + - ccache --show-stats + - ccache --show-log-stats || true - | # ccahe_stats echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K" From abbb3a448997f3672ef579074c3f7c165b164104 Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Wed, 24 Jan 2024 03:08:20 +0000 Subject: [PATCH 5/6] Update .gitlab-ci.yml file keep --verbose for Alpine builds --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce17581b03..9eb24f0611 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -673,8 +673,8 @@ Alpine 3 GCC: - - | # ccache_stats echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:" - - ccache --show-stats - - ccache --show-log-stats || true + - ccache --show-stats --verbose + - ccache --show-log-stats --verbose - | # ccahe_stats echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K" From ebe3262d7447cdfbf3f92504d49943e0fed58b56 Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Wed, 24 Jan 2024 19:08:24 +0000 Subject: [PATCH 6/6] Update .gitlab-ci.yml file Try to make a batocera:amd64 build --- .gitlab-ci.yml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9eb24f0611..d96504ad63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -452,6 +452,45 @@ Debian oldstable:arm64: # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" +batocera:arm64: + extends: Debian stable:arm64 + + when: manual + + allow_failure: true + + artifacts: + paths: + - "bin/" + - "src/comptime.h" + expose_as: "Debian old arm64" + name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-batocera-aarch64" + + script: + - - | + # apt_toolchain + echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" + - apt-get install gcc-aarch64-linux-gnu || apt-get install gcc + - | + # apt_toolchain + echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" + + - - | + # apt_development + echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages" + - apt-get install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libopenmpt-dev:arm64 libminiupnpc-dev:arm64 + - | + # apt_development + echo -e "\e[0Ksection_end:`date +%s`:apt_development\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 LINUX64=1 ERRORMODE=1 NONX86=1 ARM64=1 NOGME=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1 ARM64=1 NOGME=1 + - | + # make + echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" + Windows x64: stage: build