Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Skydusk
SRB2
Commits
3019e70e
Commit
3019e70e
authored
2 months ago
by
Logan Aerl Arias
Browse files
Options
Downloads
Patches
Plain Diff
GitLab CI: use Ninja on MacOSX
GitLab CI: use Ninja on MacOSX
parent
aebc3ff5
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab/ci/jobs/macos-arm64.yml
+20
-1
20 additions, 1 deletion
.gitlab/ci/jobs/macos-arm64.yml
.gitlab/ci/jobs/macos-x86_64.yml
+2
-2
2 additions, 2 deletions
.gitlab/ci/jobs/macos-x86_64.yml
with
22 additions
and
3 deletions
.gitlab/ci/jobs/macos-arm64.yml
+
20
−
1
View file @
3019e70e
...
@@ -27,7 +27,7 @@ osxcross arm64:
...
@@ -27,7 +27,7 @@ osxcross arm64:
-
-
|
-
-
|
# cmake
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding 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_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS:BOOL=ON -DSRB2_CONFIG_USE_GME:BOOL=OFF -DSRB2_SDL2_EXE_NAME=srb2_$CI_PIPELINE_ID
-
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_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS:BOOL=ON -DSRB2_CONFIG_USE_GME:BOOL=OFF -DSRB2_SDL2_EXE_NAME=srb2_$CI_PIPELINE_ID
-G "Ninja"
-
|
-
|
# make
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
...
@@ -48,3 +48,22 @@ osxcross arm64:
...
@@ -48,3 +48,22 @@ osxcross arm64:
-
|
-
|
# make
# make
echo -e "\e[0Ksection_end:`date +%s`:copy\r\e[0K"
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"
-
-
|
# 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"
This diff is collapsed.
Click to expand it.
.gitlab/ci/jobs/macos-x86_64.yml
+
2
−
2
View file @
3019e70e
...
@@ -27,7 +27,7 @@ osxcross x86_64:
...
@@ -27,7 +27,7 @@ osxcross x86_64:
-
-
|
-
-
|
# cmake
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding 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_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_CONFIG_USE_GME:BOOL=OFF -DSRB2_SDL2_EXE_NAME=srb2_$CI_PIPELINE_ID
-
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_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_CONFIG_USE_GME:BOOL=OFF -DSRB2_SDL2_EXE_NAME=srb2_$CI_PIPELINE_ID
-G "Ninja"
-
|
-
|
# make
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
...
@@ -35,7 +35,7 @@ osxcross x86_64:
...
@@ -35,7 +35,7 @@ osxcross x86_64:
-
-
|
-
-
|
# make
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
-
cmake
--build build.x86_64 --parallel 1 --verbose
-
cmake --build build.x86_64 --parallel 1 --verbose
-
|
-
|
# make
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment