mirror of
				https://github.com/KartKrewDev/RingRacers.git
				synced 2025-10-30 08:01:28 +00:00 
			
		
		
		
	Merge branch 'srb2ci-2025-02' into 'master'
update srb2ci yml files See merge request KartKrew/RingRacers!87
This commit is contained in:
		
						commit
						9fb154b117
					
				
					 16 changed files with 243 additions and 61 deletions
				
			
		|  | @ -12,6 +12,7 @@ variables: | |||
| 
 | ||||
| stages: | ||||
|   - build | ||||
|   - osxcross | ||||
| 
 | ||||
| default: | ||||
|   interruptible: true | ||||
|  |  | |||
|  | @ -15,8 +15,8 @@ Alpine 3 GCC: | |||
| 
 | ||||
|   artifacts: | ||||
|     paths: | ||||
|       - "build.alpine3/bin/" | ||||
|       - "build.alpine3/src/config.h" | ||||
|       - "build.cmake/bin/" | ||||
|       - "build.cmake/src/config.h" | ||||
|     expose_as: "Apline-3" | ||||
|     name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Apline-3" | ||||
| 
 | ||||
|  | @ -50,7 +50,7 @@ Alpine 3 GCC: | |||
|     - - | | ||||
|           # apk_common | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:apk_common[collapsed=true]\r\e[0KInstalling common packages" | ||||
|       - apk add make git ccache nasm | ||||
|       - apk add cmake make git ccache nasm | ||||
|       - | | ||||
|           # apk_common | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:apk_common\r\e[0K" | ||||
|  | @ -95,7 +95,7 @@ Alpine 3 GCC: | |||
|     - - | | ||||
|           # apk_toolchain | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:apk_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" | ||||
|       - apk add gcc | ||||
|       - apk add g++ | ||||
|       - | | ||||
|           # apk_toolchain | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:apk_toolchain\r\e[0K" | ||||
|  | @ -103,7 +103,7 @@ Alpine 3 GCC: | |||
|     - - | | ||||
|           # apk_development | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:apk_development[collapsed=true]\r\e[0KInstalling development packages" | ||||
|       - apk add cmake musl-dev sdl2_mixer-dev libpng-dev curl-dev libgme-dev libopenmpt-dev miniupnpc-dev | ||||
|       - apk add cmake musl-dev sdl2_mixer-dev libpng-dev curl-dev libgme-dev libopenmpt-dev miniupnpc-dev elfutils-dev | ||||
|       - | | ||||
|           # apk_development | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:apk_development\r\e[0K" | ||||
|  | @ -111,7 +111,7 @@ Alpine 3 GCC: | |||
|     - - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" | ||||
|       - cmake -B build.alpine3 -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" | ||||
|       - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF | ||||
|       - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" | ||||
|  | @ -119,7 +119,7 @@ Alpine 3 GCC: | |||
|     - - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" | ||||
|       - make --directory=build.alpine3 --keep-going || make --directory=build.alpine3 --keep-going | ||||
|       - cmake --build build.cmake --parallel 1 --verbose | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" | ||||
|  |  | |||
|  | @ -16,7 +16,7 @@ batocera:arm64: | |||
|     - - | | ||||
|           # 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-get install g++-aarch64-linux-gnu || apt-get install g++ | ||||
|       - | | ||||
|           # apt_toolchain | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" | ||||
|  | @ -32,7 +32,7 @@ batocera:arm64: | |||
|     - - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" | ||||
|       - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" | ||||
|       - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF | ||||
|       - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" | ||||
|  | @ -40,7 +40,7 @@ batocera:arm64: | |||
|     - - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" | ||||
|       - make --directory=build.cmake --keep-going || make --directory=build.cmake --keep-going | ||||
|       - cmake --build build.cmake --parallel 1 --verbose | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" | ||||
|  |  | |||
|  | @ -18,7 +18,7 @@ Debian oldstable:amd64: | |||
|     - - | | ||||
|           # 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-get install ++-x86-64-linux-gnu || apt-get install g++ | ||||
|       - | | ||||
|           # apt_toolchain | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" | ||||
|  | @ -34,7 +34,7 @@ Debian oldstable:amd64: | |||
|     - - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" | ||||
|       - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" | ||||
|       - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF | ||||
|       - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" | ||||
|  | @ -42,7 +42,7 @@ Debian oldstable:amd64: | |||
|     - - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" | ||||
|       - make --directory=build.cmake --keep-going || make --directory=build.cmake --keep-going | ||||
|       - cmake --build build.cmake --parallel 1 --verbose | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" | ||||
|  |  | |||
|  | @ -18,7 +18,7 @@ Debian oldstable:arm64: | |||
|     - - | | ||||
|           # 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-get install g++-aarch64-linux-gnu || apt-get install g++ | ||||
|       - | | ||||
|           # apt_toolchain | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" | ||||
|  | @ -34,7 +34,7 @@ Debian oldstable:arm64: | |||
|     - - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" | ||||
|       - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" | ||||
|       - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF | ||||
|       - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" | ||||
|  | @ -42,7 +42,7 @@ Debian oldstable:arm64: | |||
|     - - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" | ||||
|       - make --directory=build.cmake --keep-going || make --directory=build.cmake --keep-going | ||||
|       - cmake --build build.cmake --parallel 1 --verbose | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" | ||||
|  |  | |||
|  | @ -12,6 +12,7 @@ Debian stable:amd64: | |||
| 
 | ||||
|   variables: | ||||
|     CC: x86_64-linux-gnu-gcc | ||||
|     CXX: x86_64-linux-gnu-g++ | ||||
|     LDFLAGS: -Wl,-fuse-ld=gold | ||||
|     OBJCOPY: x86_64-linux-gnu-objcopy | ||||
|     OBJDUMP: x86_64-linux-gnu-objdump | ||||
|  | @ -23,7 +24,7 @@ Debian stable:amd64: | |||
|     - - | | ||||
|           # 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-get install g++-x86-64-linux-gnu || apt-get install g++ | ||||
|       - | | ||||
|           # apt_toolchain | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" | ||||
|  | @ -42,7 +43,6 @@ Debian stable:amd64: | |||
|       - | | ||||
|           CCACHE=$(which ccache) | ||||
|           cmake -B build.cmake \ | ||||
|             -G "Unix Makefiles" \ | ||||
|             -DCMAKE_C_COMPILER_LAUNCHER=$CCACHE \ | ||||
|             -DCMAKE_CXX_COMPILER_LAUNCHER=$CCACHE \ | ||||
|             -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF | ||||
|  | @ -53,7 +53,7 @@ Debian stable:amd64: | |||
|     - - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" | ||||
|       - make --directory=build.cmake --keep-going || make --directory=build.cmake --keep-going | ||||
|       - cmake --build build.cmake --parallel 1 --verbose | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" | ||||
|  |  | |||
|  | @ -14,16 +14,18 @@ Debian stable:arm64: | |||
| 
 | ||||
|   variables: | ||||
|     CC: aarch64-linux-gnu-gcc | ||||
|     CXX: aarch64-linux-gnu-g++ | ||||
|     LDFLAGS: -Wl,-fuse-ld=gold | ||||
|     OBJCOPY: aarch64-linux-gnu-objcopy | ||||
|     OBJDUMP: aarch64-linux-gnu-objdump | ||||
|     LD: aarch64-linux-gnu-ld | ||||
|     PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig | ||||
| 
 | ||||
|   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-get install g++-aarch64-linux-gnu || apt-get install g++ | ||||
|       - | | ||||
|           # apt_toolchain | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" | ||||
|  | @ -39,7 +41,7 @@ Debian stable:arm64: | |||
|     - - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" | ||||
|       - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" | ||||
|       - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF | ||||
|       - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" | ||||
|  | @ -47,7 +49,7 @@ Debian stable:arm64: | |||
|     - - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" | ||||
|       - make --directory=build.cmake --keep-going || make --directory=build.cmake --keep-going | ||||
|       - cmake --build build.cmake --parallel 1 --verbose | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" | ||||
|  |  | |||
|  | @ -9,8 +9,8 @@ Debian stable Clang: | |||
| 
 | ||||
|   artifacts: | ||||
|     paths: | ||||
|       - "build.clang/bin/" | ||||
|       - "build.clang/src/config.h" | ||||
|       - "build.cmake/bin/" | ||||
|       - "build.cmake/src/config.h" | ||||
|     expose_as: "clang" | ||||
|     name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-clang" | ||||
| 
 | ||||
|  | @ -41,7 +41,7 @@ Debian stable Clang: | |||
|     - - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" | ||||
|       - cmake -B build.clang -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" | ||||
|       - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF | ||||
|       - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" | ||||
|  | @ -49,7 +49,7 @@ Debian stable Clang: | |||
|     - - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" | ||||
|       - make --directory=build.clang --keep-going || make --directory=build.clang --keep-going | ||||
|       - cmake --build build.cmake --parallel 1 --verbose | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" | ||||
|  |  | |||
|  | @ -14,15 +14,17 @@ Debian stable:i386: | |||
| 
 | ||||
|   variables: | ||||
|     CC: i686-linux-gnu-gcc | ||||
|     CXX: i686-linux-gnu-g++ | ||||
|     OBJCOPY: i686-linux-gnu-objcopy | ||||
|     OBJDUMP: i686-linux-gnu-objdump | ||||
|     LD: i686-linux-gnu-ld | ||||
|     PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig | ||||
| 
 | ||||
|   script: | ||||
|     - - | | ||||
|           # apt_toolchain | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" | ||||
|       - apt-get install gcc-i686-linux-gnu || apt-get install gcc | ||||
|       - apt-get install g++-i686-linux-gnu || apt-get install g++ | ||||
|       - | | ||||
|           # apt_toolchain | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" | ||||
|  | @ -38,7 +40,7 @@ Debian stable:i386: | |||
|     - - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" | ||||
|       - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" | ||||
|       - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF | ||||
|       - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" | ||||
|  | @ -46,7 +48,7 @@ Debian stable:i386: | |||
|     - - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" | ||||
|       - make --directory=build.cmake --keep-going || make --directory=build.cmake --keep-going | ||||
|       - cmake --build build.cmake --parallel 1 --verbose | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" | ||||
|  |  | |||
|  | @ -18,13 +18,14 @@ Debian testing GCC: | |||
| 
 | ||||
|   variables: | ||||
|     CC: gcc | ||||
|     CXX: g++ | ||||
|     LDFLAGS: -Wl,-fuse-ld=gold | ||||
| 
 | ||||
|   script: | ||||
|     - - | | ||||
|           # apt_toolchain | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" | ||||
|       - apt-get install gcc | ||||
|       - apt-get install g++ | ||||
|       - | | ||||
|           # apt_toolchain | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" | ||||
|  | @ -40,7 +41,7 @@ Debian testing GCC: | |||
|     - - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" | ||||
|       - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" | ||||
|       - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF | ||||
|       - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" | ||||
|  | @ -48,7 +49,7 @@ Debian testing GCC: | |||
|     - - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" | ||||
|       - make --directory=build.cmake --keep-going || make --directory=build.cmake --keep-going | ||||
|       - cmake --build build.cmake --parallel 1 --verbose | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" | ||||
|  |  | |||
|  | @ -3,26 +3,69 @@ osxcross arm64: | |||
| 
 | ||||
|   stage: build | ||||
| 
 | ||||
|   when: manual | ||||
|   cache: | ||||
|     - key: ccache-$CI_JOB_NAME_SLUG-$CI_COMMIT_REF_SLUG | ||||
|       fallback_keys: | ||||
|         - ccache-$CI_JOB_NAME_SLUG-$CI_DEFAULT_BRANCH | ||||
|         - ccache-$CI_JOB_NAME_SLUG-master | ||||
|       paths: | ||||
|         - build/ccache | ||||
|         - build/ccache_statslog | ||||
| 
 | ||||
|   allow_failure: true | ||||
|     - key: apt-$CI_JOB_IMAGE | ||||
|       paths: | ||||
|         - build/apt-cache | ||||
|       unprotect: true | ||||
| 
 | ||||
|     - key: vcpkg-root | ||||
|       paths: | ||||
|         - build/vcpkg-root | ||||
|       unprotect: true | ||||
| 
 | ||||
|     - key: vcpkg-binary-cache-arm64-osx | ||||
|       paths: | ||||
|         - build/vcpkg-binary-cache | ||||
|       unprotect: true | ||||
| 
 | ||||
|   artifacts: | ||||
|     paths: | ||||
|       - "build.osxcross/bin/" | ||||
|       - "build.osxcross/src/config.h" | ||||
|       - "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-clang" | ||||
|     name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-arm64-apple-darwin21.4" | ||||
| 
 | ||||
|   variables: | ||||
|     OSXCROSS_HOST: arm64-apple-darwin21.4 | ||||
|     LD: arm64-apple-darwin21.4-ld | ||||
| 
 | ||||
|   script: | ||||
|     - | | ||||
|         # vcpkg | ||||
|         echo -e "\e[0Ksection_start:`date +%s`:vcpkg-root[collapsed=true]\r\e[0KUpdating vcpkg" | ||||
| 
 | ||||
|         if [ -d "build/vcpkg-root" ]; then | ||||
|           pushd build/vcpkg-root | ||||
|           git fetch https://github.com/Microsoft/vcpkg master | ||||
|           git reset --hard FETCH_HEAD | ||||
|           popd | ||||
|         else | ||||
|           mkdir -p build | ||||
|           git clone https://github.com/Microsoft/vcpkg build/vcpkg-root | ||||
|         fi | ||||
| 
 | ||||
|         export VCPKG_ROOT=$(pwd)/build/vcpkg-root | ||||
|         export VCPKG_BINARY_SOURCES="clear;files,$(pwd)/build/vcpkg-binary-cache,readwrite" | ||||
| 
 | ||||
|         mkdir -p "build/vcpkg-binary-cache" | ||||
| 
 | ||||
|         echo -e "\e[0Ksection_end:`date +%s`:vcpkg-root\r\e[0K" | ||||
| 
 | ||||
|     - - | | ||||
|           # apt_development | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:macports_development[collapsed=true]\r\e[0KInstalling development packages" | ||||
|       - osxcross-macports install --arm64 curl libopenmpt libsdl2_mixer | ||||
|       - osxcross-macports install --arm64 libxmp wavpack libopenmpt opusfile || osxcross-macports install --arm64 libxmp wavpack libopenmpt opusfile | ||||
|       - osxcross-macports install --static --arm64 curl libsdl2_mixer libpng || osxcross-macports install --static --arm64 curl libsdl2_mixer libpng | ||||
|       - | | ||||
|           # apt_development | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:macports_development\r\e[0K" | ||||
|  | @ -30,7 +73,7 @@ osxcross arm64: | |||
|     - - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" | ||||
|       - cmake -B build.osxcross --toolchain /osxcross/toolchain.cmake -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DOPENMPT_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/include" -DSDL2_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/lib" -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" | ||||
|       - cmake -B build.arm64 --toolchain /osxcross/toolchain.cmake -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DOPENMPT_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/include" -DSDL2_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/lib" -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_SDL2_EXE_NAME=ringracers_$CI_PIPELINE_ID | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" | ||||
|  | @ -38,7 +81,47 @@ osxcross arm64: | |||
|     - - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" | ||||
|       - make --directory=build.osxcross --keep-going || make --directory=build.osxcross --keep-going | ||||
|       - cmake --build build.arm64 --parallel 1 --verbose | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" | ||||
| 
 | ||||
|     - - | | ||||
|           # copy config.h | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:copy[collapsed=false]\r\e[0KCopying config.h" | ||||
|       - mkdir --parents --verbose build.arm64/dist | ||||
|       - cp --reflink=auto --sparse=always --verbose build.arm64/src/config.h build.arm64/dist/arm64.h | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:copy\r\e[0K" | ||||
| 
 | ||||
| 
 | ||||
|   after_script: | ||||
|     - - | | ||||
|            # apt_clean | ||||
|            echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages" | ||||
|       - apt-get autoclean | ||||
|       - | | ||||
|           # apt_clean | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K" | ||||
| 
 | ||||
|     - - | | ||||
|           # vcpkg_clean | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:vcpkg_clean[collapsed=true]\r\e[0KCleaning vcpkg-root" | ||||
| 
 | ||||
|           if [ -d "build/vcpkg-root" ]; then | ||||
|             pushd "build/vcpkg-root" | ||||
|             git clean | ||||
|             popd | ||||
|           fi | ||||
| 
 | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:vcpkg_clean\r\e[0K" | ||||
| 
 | ||||
|     - - | | ||||
|           # 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 | ||||
|       - | | ||||
|           # ccahe_stats | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K" | ||||
|  |  | |||
|  | @ -29,10 +29,11 @@ osxcross x86_64: | |||
| 
 | ||||
|   artifacts: | ||||
|     paths: | ||||
|       - "build.osxcross/bin/" | ||||
|       - "build.osxcross/src/config.h" | ||||
|       - "build.x86_64/bin/" | ||||
|       - "build.x86_64/dist/x86_64.h" | ||||
|       - "build.x86_64/src/config.h" | ||||
|     expose_as: "Mac x86_64" | ||||
|     name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-clang" | ||||
|     name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86_64-apple-darwin21.4" | ||||
| 
 | ||||
|   variables: | ||||
|     OSXCROSS_HOST: x86_64-apple-darwin21.4 | ||||
|  | @ -63,7 +64,8 @@ osxcross x86_64: | |||
|     - - | | ||||
|           # apt_development | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:macports_development[collapsed=true]\r\e[0KInstalling development packages" | ||||
|       - osxcross-macports install curl libopenmpt libsdl2_mixer | ||||
|       - osxcross-macports install libxmp wavpack libopenmpt opusfile || osxcross-macports install libxmp wavpack libopenmpt opusfile | ||||
|       - osxcross-macports install --static curl libsdl2_mixer libpng || osxcross-macports install --static curl libsdl2_mixer libpng | ||||
|       - | | ||||
|           # apt_development | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:macports_development\r\e[0K" | ||||
|  | @ -71,7 +73,7 @@ osxcross x86_64: | |||
|     - - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" | ||||
|       - cmake -B build.osxcross --toolchain /osxcross/toolchain.cmake -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DOPENMPT_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/include" -DSDL2_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/lib" -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" | ||||
|       - cmake -B build.x86_64 --toolchain /osxcross/toolchain.cmake -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DOPENMPT_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/include" -DSDL2_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/lib" -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_SDL2_EXE_NAME=ringracers_$CI_PIPELINE_ID | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" | ||||
|  | @ -79,11 +81,21 @@ osxcross x86_64: | |||
|     - - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" | ||||
|       - make --directory=build.osxcross --keep-going || make --directory=build.osxcross --keep-going | ||||
|       - cmake --build build.x86_64 --parallel 1 --verbose | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" | ||||
| 
 | ||||
|     - - | | ||||
|           # copy config.h | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:copy[collapsed=false]\r\e[0KCopying config.h" | ||||
|       - mkdir --parents --verbose build.x86_64/dist | ||||
|       - cp --reflink=auto --sparse=always --verbose build.x86_64/src/config.h build.x86_64/dist/x86_64.h | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:copy\r\e[0K" | ||||
| 
 | ||||
| 
 | ||||
|   after_script: | ||||
|     - - | | ||||
|            # apt_clean | ||||
|  |  | |||
							
								
								
									
										67
									
								
								.gitlab/ci/jobs/osxccross-universal.yml
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										67
									
								
								.gitlab/ci/jobs/osxccross-universal.yml
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,67 @@ | |||
| osxcross universal: | ||||
|   image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:stable | ||||
| 
 | ||||
|   dependencies: | ||||
|     - osxcross arm64 | ||||
|     - osxcross x86_64 | ||||
|   needs: | ||||
|     - job: osxcross arm64 | ||||
|     - job: osxcross x86_64 | ||||
| 
 | ||||
|   stage: osxcross | ||||
| 
 | ||||
|   artifacts: | ||||
|     paths: | ||||
|       - "dist/bin" | ||||
|       - "dist/src" | ||||
|     expose_as: "Mac Universal" | ||||
|     name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-lipo-apple-darwin21.4" | ||||
| 
 | ||||
|   script: | ||||
|     - - | | ||||
|          # mkdir | ||||
|          echo -e "\e[0Ksection_start:`date +%s`:mkdir[collapsed=true]\r\e[0KMaking dist folder" | ||||
|          mkdir --parents --verbose dist/src dist/bin | ||||
|       - | | ||||
|           # mkdir | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:mkdir\r\e[0K" | ||||
| 
 | ||||
|     - - | | ||||
|          # copy-config | ||||
|          echo -e "\e[0Ksection_start:`date +%s`:x86_64-config[collapsed=true]\r\e[0KCopying x86_64 config" | ||||
|       - cp --reflink=auto --sparse=always --verbose --target-directory=dist/src/ build.*/dist/*.h | ||||
|       - | | ||||
|           # x86_64-config | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:x86_64-config\r\e[0K" | ||||
| 
 | ||||
|     - - | | ||||
|          # copy-build | ||||
|          echo -e "\e[0Ksection_start:`date +%s`:copy-build[collapsed=true]\r\e[0KCopying ALL build" | ||||
|       - cp --reflink=auto --sparse=always --recursive --verbose --target-directory=dist/ build.*/bin/ | ||||
|       - | | ||||
|           # copy-build | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:copy-build\r\e[0K" | ||||
| 
 | ||||
|     - - | | ||||
|          # link-build | ||||
|          echo -e "\e[0Ksection_start:`date +%s`:link-build[collapsed=true]\r\e[0KLinking universal build" | ||||
|       - lipo -create -output dist/bin/ringracers_$CI_PIPELINE_ID.app/Contents/MacOS/ringracers_$CI_PIPELINE_ID build.*/bin/ringracers_$CI_PIPELINE_ID.app/Contents/MacOS/ringracers_$CI_PIPELINE_ID | ||||
|       - | | ||||
|           # universal-build | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:link-build\r\e[0K" | ||||
| 
 | ||||
|     - - | | ||||
|          # arm64-verify | ||||
|          echo -e "\e[0Ksection_start:`date +%s`:arm64-verify[collapsed=true]\r\e[0KVerifying arm64" | ||||
|       - lipo dist/bin/ringracers_$CI_PIPELINE_ID.app/Contents/MacOS/ringracers_$CI_PIPELINE_ID -verify_arch arm64 | ||||
|       - | | ||||
|           # arm64-verify | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:arm64-verify\r\e[0K" | ||||
| 
 | ||||
|     - - | | ||||
|          # x86_64-verify | ||||
|          echo -e "\e[0Ksection_start:`date +%s`:x86_64-verify[collapsed=true]\r\e[0KVerifying x86_64" | ||||
|       - lipo dist/bin/ringracers_$CI_PIPELINE_ID.app/Contents/MacOS/ringracers_$CI_PIPELINE_ID -verify_arch x86_64 | ||||
|       - | | ||||
|           # x86_64-verify | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:x86_64-verify\r\e[0K" | ||||
|  | @ -16,12 +16,14 @@ Windows x64: | |||
| 
 | ||||
|   variables: | ||||
|     PREFIX: x86_64-w64-mingw32 | ||||
|     CC: /usr/lib/ccache/x86_64-w64-mingw32-gcc-12-posix | ||||
|     CXX: /usr/lib/ccache/x86_64-w64-mingw32-g++ | ||||
| 
 | ||||
|   script: | ||||
|     - - | | ||||
|           # apt_toolchain | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" | ||||
|       - apt-get install gcc-mingw-w64-x86-64-win32 | ||||
|       - apt-get install g++-mingw-w64-x86-64-win32 | ||||
|       - | | ||||
|           # apt_toolchain | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" | ||||
|  | @ -37,7 +39,19 @@ Windows x64: | |||
|     - - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" | ||||
|       - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ENABLE_DISCORDRPC=OFF -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-mingw-static -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/toolchains/mingw.cmake | ||||
|       - | | ||||
|           cmake \ | ||||
|             -B build.cmake \ | ||||
|             -G "Unix Makefiles" \ | ||||
|             -DSRB2_USE_CCACHE=NO \ | ||||
|             -DCMAKE_C_COMPILER=/usr/lib/ccache/x86_64-w64-mingw32-gcc-12-posix \ | ||||
|             -DCMAKE_CXX_COMPILER=/usr/lib/ccache/x86_64-w64-mingw32-g++ \ | ||||
|             -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/toolchains/mingw.cmake \ | ||||
|             -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \ | ||||
|             -DSRB2_CONFIG_ENABLE_DISCORDRPC=OFF \ | ||||
|             -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake \ | ||||
|             -DVCPKG_TARGET_TRIPLET=x64-mingw-static \ | ||||
|             -DSRB2_CONFIG_ALWAYS_MAKE_DEBUGLINK=ON | ||||
|       - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" | ||||
|  | @ -45,7 +59,7 @@ Windows x64: | |||
|     - - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" | ||||
|       - make --directory=build.clang --keep-going || make --directory=build.clang --keep-going | ||||
|       - cmake --build build.cmake --parallel 1 --verbose | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" | ||||
|  |  | |||
|  | @ -38,8 +38,8 @@ Windows x86: | |||
| 
 | ||||
|   variables: | ||||
|     PREFIX: i686-w64-mingw32 | ||||
|     CC: /usr/bin/i686-w64-mingw32-gcc-posix | ||||
|     CXX: /usr/bin/i686-w64-mingw32-g++-posix | ||||
|     CC: /usr/lib/ccache/i686-w64-mingw32-gcc-12-posix | ||||
|     CXX: /usr/lib/ccache/i686-w64-mingw32-g++ | ||||
| 
 | ||||
|   script: | ||||
|     - | | ||||
|  | @ -66,7 +66,7 @@ Windows x86: | |||
|     - - | | ||||
|           # apt_toolchain | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" | ||||
|       - apt-get install gcc-mingw-w64-i686-win32 | ||||
|       - apt-get install g++-mingw-w64-i686-win32 | ||||
|       - | | ||||
|           # apt_toolchain | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" | ||||
|  | @ -83,18 +83,18 @@ Windows x86: | |||
|           # cmake | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" | ||||
|       - | | ||||
|           CCACHE=$(which ccache) | ||||
| 
 | ||||
|           cmake \ | ||||
|             --preset ninja-x86_mingw_static_vcpkg-debug \ | ||||
|             -G "Unix Makefiles" \ | ||||
|             -DCMAKE_C_COMPILER_LAUNCHER=$CCACHE \ | ||||
|             -DCMAKE_CXX_COMPILER_LAUNCHER=$CCACHE \ | ||||
|             -DCMAKE_C_COMPILER=/usr/bin/i686-w64-mingw32-gcc-posix \ | ||||
|             -DCMAKE_CXX_COMPILER=/usr/bin/i686-w64-mingw32-g++-posix \ | ||||
|             -DSRB2_USE_CCACHE=NO \ | ||||
|             -DCMAKE_C_COMPILER=/usr/lib/ccache/i686-w64-mingw32-gcc-12-posix \ | ||||
|             -DCMAKE_CXX_COMPILER=/usr/lib/ccache/i686-w64-mingw32-g++ \ | ||||
|             -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/toolchains/mingw.cmake \ | ||||
|             -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \ | ||||
|             -DSRB2_CONFIG_ENABLE_DISCORDRPC=OFF \ | ||||
|             -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake \ | ||||
|             -DVCPKG_TARGET_TRIPLET=x86-mingw-static \ | ||||
|             -DSRB2_CONFIG_ALWAYS_MAKE_DEBUGLINK=ON | ||||
| 
 | ||||
|       - | | ||||
|           # cmake | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" | ||||
|  | @ -102,7 +102,7 @@ Windows x86: | |||
|     - - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" | ||||
|       - cmake --build --preset ninja-x86_mingw_static_vcpkg-debug --parallel 1 -- --keep-going || cmake --build --preset ninja-x86_mingw_static_vcpkg-debug --parallel 1 -- --keep-going | ||||
|       - cmake --build --preset ninja-x86_mingw_static_vcpkg-debug --parallel 1 --verbose | ||||
|       - | | ||||
|           # make | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" | ||||
|  |  | |||
|  | @ -61,7 +61,7 @@ | |||
|     - - | | ||||
|           # apt_update | ||||
|           echo -e "\e[0Ksection_start:`date +%s`:apt_update[collapsed=true]\r\e[0KUpdating APT listing" | ||||
|       - apt-get update | ||||
|       - timeout 2m apt-get update || timeout 2m apt-get update | ||||
|       - | | ||||
|           # apt_update | ||||
|           echo -e "\e[0Ksection_end:`date +%s`:apt_update\r\e[0K" | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Eidolon
						Eidolon