Commit graph

105 commits

Author SHA1 Message Date
LJ Sonic
59b2764758 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into movie
# Conflicts:
#	.gitlab-ci.yml
#	src/Makefile.d/win32.mk
#	src/Sourcefile
#	src/lua_maplib.c
#	src/r_main.c
2024-01-04 16:25:17 +01:00
Alam Ed Arias
4ff5dc7684 GitLab CI: also need libswscale-dev for FFmpeg support 2023-11-09 09:38:30 -05:00
Alam Ed Arias
96ff675efc Merge branch 'master' into movie 2023-11-09 09:29:42 -05:00
Alam Ed Arias
d4d110af28 GitLab CI: install libavformat-dev for FFmpeg support 2023-11-09 09:29:29 -05:00
Alam Ed Arias
0d2fc94eac GitLab CI: install libavcodec-dev for FFmpeg support 2023-11-09 09:23:14 -05:00
Alam Ed Arias
7643ffadbc Update .gitlab-ci.yml file
Limit builds to just "Windows x86" and "Debian stable:amd64", all other builds can be started manually
2023-11-01 15:13:40 +00:00
Alam Ed Arias
18f61ab90c Update .gitlab-ci.yml file
Add ARM64=1 for arm build
2023-10-29 05:14:48 +00:00
Alam Ed Arias
86d7c9862c Update .gitlab-ci.yml file
Now, try compiling with musl on Debian testing
2023-10-28 16:20:49 +00:00
Alam Ed Arias
f705e53826 GitLab CI: try compiling with dummy interface with musl 2023-10-28 11:49:26 -04:00
Alam Ed Arias
eb38267823 GitLab CI: More work 2023-10-20 13:03:52 +00:00
Alam Ed Arias
265c1ac0c8 Update .gitlib-ci.yml 2023-10-17 13:11:17 +00:00
Alam Ed Arias
330b10cbb5 Update .gitlab-ci.yml file 2023-10-17 01:41:43 +00:00
Alam Ed Arias
4bec143427 Update .gitlab-ci.yml file
Do not care for non-prototypes for clang-testing job
2023-10-15 23:42:27 +00:00
Alam Ed Arias
b27de309a8 Update .gitlab-ci.yml file
Testing compiling with Debian's testing clang package
2023-10-15 20:32:11 +00:00
Alam Ed Arias
976a2850af Update .gitlab-ci.yml file
change name of artifact for clang build
2023-10-15 16:02:27 -04:00
Alam Ed Arias
6c19fcc607 Update .gitlab-ci.yml file
Try compiling with clang
2023-10-15 18:56:06 +00:00
Alam Ed Arias
aa21dcad33 Update .gitlab-ci.yml file
Try to hide echos
2023-10-15 17:50:45 +00:00
Alam Ed Arias
3adc15d521 Update .gitlab-ci.yml file
Only need to setup debconf in before_script
2023-10-15 17:30:07 +00:00
Alam Ed Arias
b8861b1912 Update .gitlab-ci.yml file
Let see if I need to need to run export again in the main build script
2023-10-15 17:11:44 +00:00
Alam Ed Arias
595ce3e225 Update .gitlab-ci.yml file
Update Debian image
2023-10-15 16:08:15 +00:00
Alam Ed Arias
8ace36efbf Update .gitlab-ci.yml file
Try to list packages that can be upgraded
2023-10-15 14:44:17 +00:00
Alam Ed Arias
de7f0cba1b Update .gitlab-ci.yml file
Can not set CCACHE=1 in shell env
2023-10-15 04:55:29 +00:00
Alam Ed Arias
4904177312 Update .gitlab-ci.yml file
Move the exports to variables section
2023-10-15 04:34:39 +00:00
Alam Ed Arias
50d8cb4c00 Update .gitlab-ci.yml file
hide ccache statistics
2023-10-14 21:08:13 +00:00
Alam Ed Arias
c74711fefa Update .gitlab-ci.yml file
section off ccache output
2023-10-14 19:51:11 +00:00
Alam Ed Arias
dee306c58b Update .gitlab-ci.yml file
I need to make the .ccache folder
2023-10-14 15:25:04 +00:00
Alam Ed Arias
e6044ec9f1 Update .gitlab-ci.yml file
append, not overwrite ccache.conf
2023-10-14 15:05:50 +00:00
Alam Ed Arias
2e4d5b6fa9 Update .gitlab-ci.yml file
mkdir ~/.ccache before make the config file
2023-10-14 14:29:57 +00:00
Alam Ed Arias
1886b9f945 Update .gitlab-ci.yml file
Add more sections to the build log
2023-10-14 14:18:23 +00:00
Alam Ed Arias
c17c5327a8 Update .gitlab-ci.yml file
remove extra space
2023-10-14 13:11:49 +00:00
Alam Ed Arias
1a0fad75f9 Update .gitlab-ci.yml file
fixup EOL on section commands
2023-10-14 13:09:59 +00:00
Alam Ed Arias
ff3993257a Update .gitlab-ci.yml file
place sections around "apt-get install" and "make" commands
2023-10-14 13:01:32 +00:00
Alam Ed Arias
52e4ed33af Update .gitlab-ci.yml file
Fix install command for GCC in build jobs
2023-10-14 11:54:16 +00:00
Alam Ed Arias
d659ce563c Update .gitlab-ci.yml file
Set common apt settings to /etc/apt/apt.conf.d/99build
2023-10-14 11:40:25 +00:00
Alam Ed Arias
b469064e40 Update .gitlab-ci.yml file
remove double space
2023-10-14 03:11:56 +00:00
Alam Ed Arias
98fd34e76c Update .gitlab-ci.yml file
save ccache_statslog between runs?
2023-10-14 02:11:52 +00:00
Alam Ed Arias
2fe5755f53 Update .gitlab-ci.yml file
Fix CCACHE_STATSLOG?
2023-10-14 01:44:23 +00:00
Alam Ed Arias
d3d3ee5451 Update .gitlab-ci.yml file
Try to keep a stats log of ccache
2023-10-14 01:37:05 +00:00
Alam Ed Arias
8f00667abe Update src/Makefile.d/*.mk
both Makefile and *.mk should be in the same EOL
2023-10-13 20:18:37 -04:00
Alam Ed Arias
fc586b5c62 Update .gitlab-ci.yml file
Build in the following order: testing, win32, amd64, i386, arm64 then win64
2023-10-13 23:46:44 +00:00
Alam Ed Arias
96beee1d4d Update .gitlab-ci.yml file
set DEBIAN_FRONTEND envvar in aptcache
2023-10-13 21:43:15 +00:00
Alam Ed Arias
796adec979 Update .gitlab-ci.yml file
Retry building so we point out why it failed to compile
2023-10-13 21:40:41 +00:00
Alam Ed Arias
fb299dd63e Update .gitlab-ci.yml file
Make the buildbot yell at us for warnings
2023-10-13 20:09:00 +00:00
Alam Ed Arias
b8fb0280ab Update .gitlab-ci.yml file
more quiet out the apt-get commands
2023-10-13 16:45:02 +00:00
Alam Ed Arias
f6d37d504b Update .gitlab-ci.yml file
quiet out the apt-get commands
2023-10-13 16:37:06 +00:00
Alam Ed Arias
aa9d84b6d2 Update .gitlab-ci.yml file
Let try building on Debian Testing
2023-10-13 16:13:31 +00:00
Alam Ed Arias
0368a1ce8b cleanup whitespace in .gitlab-ci.yml 2023-10-12 22:49:44 -04:00
Alam Ed Arias
8b33dd604b Revert "Update .gitlab-ci.yml file"
This reverts commit 5acceaa238.
2023-10-12 22:48:34 -04:00
Alam Ed Arias
5acceaa238 Update .gitlab-ci.yml file
Let see if we can pass an option for what architecture we are installing for
2023-10-13 02:46:00 +00:00
Alam Ed Arias
008efa9b0e Update .gitlab-ci.yml file
We do not need to install GCC for w64-mingw32 jobs
2023-10-13 02:08:53 +00:00