stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-03 06:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
Alam Ed Arias 2025-01-21 17:37:09 -05:00
commit e496758f27
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.circleci/config.yml
View file

@ -7,6 +7,7 @@ jobs:
environment: environment:
CC: ccache gcc CC: ccache gcc
CCACHE_COMPRESS: true CCACHE_COMPRESS: true
CFLAGS: -Wno-error=unused-result
#- image: ubuntu:trusty #- image: ubuntu:trusty
# environment: # environment:
# CC: ccache gcc -m32 # CC: ccache gcc -m32
@ -49,12 +50,15 @@ jobs:
paths: paths:
- /home/circleci/.cache/apt - /home/circleci/.cache/apt
- checkout - checkout
- run:
name: Create deps folder as needed
command: mkdir -p make/linux/64/SDL/deps/
- run: - run:
name: make master depend file name: make master depend file
command: find make/linux64/SDL/deps/ -type f -print0 | sort -z | xargs -r0 cat > make/linux64/SDL.deps command: find make/linux/64/SDL/deps/ -type f -print0 | sort -z | xargs -r0 cat > make/linux/64/SDL.deps
- restore_cache: - restore_cache:
keys: keys:
- v1-SRB2-{{ .Branch }}-{{ checksum "make/linux64/SDL.deps" }} - v1-SRB2-{{ .Branch }}-{{ checksum "make/linux/64/SDL.deps" }}
- run: - run:
name: Compile name: Compile
command: make -C src LINUX64=1 ERRORMODE=1 -k -j4 command: make -C src LINUX64=1 ERRORMODE=1 -k -j4
@ -62,6 +66,6 @@ jobs:
path: /home/circleci/SRB2/bin/ path: /home/circleci/SRB2/bin/
destination: bin destination: bin
- save_cache: - save_cache:
key: v1-SRB2-{{ .Branch }}-{{ checksum "make/linux64/SDL.deps" }} key: v1-SRB2-{{ .Branch }}-{{ checksum "make/linux/64/SDL.deps" }}
paths: paths:
- /home/circleci/.ccache - /home/circleci/.ccache