CircleCI: move to LINUX64 build

This commit is contained in:
Logan Aerl Arias 2024-01-05 22:17:00 +00:00
parent c05f6e8053
commit 8fefb8a87b

View file

@ -3,15 +3,10 @@ jobs:
build: build:
working_directory: /home/circleci/SRB2 working_directory: /home/circleci/SRB2
docker: docker:
- image: cimg/base:edge - image: cimg/base:current
environment: environment:
CC: ccache gcc -m32 CC: ccache gcc
PKG_CONFIG_LIBDIR: /usr/lib/i386-linux-gnu/pkgconfig
LIBGME_CFLAGS: -I/usr/include
LIBGME_LDFLAGS: -lgme
CCACHE_COMPRESS: true CCACHE_COMPRESS: true
WFLAGS: -Wno-unsuffixed-float-constants
GCC81: true
#- image: ubuntu:trusty #- image: ubuntu:trusty
# environment: # environment:
# CC: ccache gcc -m32 # CC: ccache gcc -m32
@ -23,9 +18,6 @@ jobs:
# GCC48: true # GCC48: true
resource_class: large resource_class: large
steps: steps:
- run:
name: Add i386 arch
command: sudo dpkg --add-architecture i386
- run: - run:
name: Add STJr PPA name: Add STJr PPA
command: | command: |
@ -47,11 +39,8 @@ jobs:
keys: keys:
- v1-SRB2-APT - v1-SRB2-APT
- run: - run:
name: Uninstall amd64 SDK name: Install SDK
command: sudo apt-get -o Dir::Cache="/home/circleci/.cache/apt" -qq -y --no-install-recommends remove libcurl4-openssl-dev:amd64 command: sudo apt-get -o Dir::Cache="/home/circleci/.cache/apt" -qq -y --no-install-recommends install git build-essential libpng-dev libsdl2-mixer-dev libgme-dev libcurl4-openssl-dev libopenmpt-dev libminiupnpc-dev gettext ccache wget gcc-multilib upx openssh-client
- run:
name: Install i386 SDK
command: sudo apt-get -o Dir::Cache="/home/circleci/.cache/apt" -qq -y --no-install-recommends install git build-essential libpng-dev:i386 libsdl2-mixer-dev:i386 libgme-dev:i386 libcurl4-openssl-dev:i386 libopenmpt-dev:i386 gettext ccache wget gcc-multilib upx openssh-client
- run: - run:
name: make md5sum name: make md5sum
command: sudo find /home/circleci/.cache/apt/archives -type f -print0 | sort -z | sudo xargs -r0 md5sum > /home/circleci/.cache/apt_archives.md5 command: sudo find /home/circleci/.cache/apt/archives -type f -print0 | sort -z | sudo xargs -r0 md5sum > /home/circleci/.cache/apt_archives.md5
@ -60,28 +49,19 @@ jobs:
paths: paths:
- /home/circleci/.cache/apt - /home/circleci/.cache/apt
- checkout - checkout
- run:
name: Compile without network support
command: make -C src LINUX=1 ERRORMODE=1 -k NONET=1 NOUPNP=1 -j4
- run:
name: wipe build
command: make -C src LINUX=1 NOUPNP=1 cleandep
- run:
name: rebuild depend
command: make -C src LINUX=1 NOUPNP=1 clean
- run: - run:
name: make master depend file name: make master depend file
command: find make/linux/SDL/deps/ -type f -print0 | sort -z | xargs -r0 cat > make/linux/SDL.deps command: find make/linux64/SDL/deps/ -type f -print0 | sort -z | xargs -r0 cat > make/linux64/SDL.deps
- restore_cache: - restore_cache:
keys: keys:
- v1-SRB2-{{ .Branch }}-{{ checksum "make/linux/SDL.deps" }} - v1-SRB2-{{ .Branch }}-{{ checksum "make/linux64/SDL.deps" }}
- run: - run:
name: Compile name: Compile
command: make -C src LINUX=1 ERRORMODE=1 NOUPNP=1 -k -j4 command: make -C src LINUX64=1 ERRORMODE=1 -k -j4
- store_artifacts: - store_artifacts:
path: /home/circleci/SRB2/bin/ path: /home/circleci/SRB2/bin/
destination: bin destination: bin
- save_cache: - save_cache:
key: v1-SRB2-{{ .Branch }}-{{ checksum "make/linux/SDL.deps" }} key: v1-SRB2-{{ .Branch }}-{{ checksum "make/linux64/SDL.deps" }}
paths: paths:
- /home/circleci/.ccache - /home/circleci/.ccache