MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Limit CI builds to 2 cpus (#1116)

Browse source 
CI only provides us 2 CPUs but nproc reports it as 32 leading to some bad balancing and some tiles stalled builds
This commit is contained in:
Anders Jenbo 2021-03-06 13:25:21 +01:00 • committed by GitHub
commit 9737ccfcfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
.circleci/config.yml
View file

@ -11,8 +11,8 @@ jobs:
- run: apt-get install -y g++ libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev git rpm
- run: apt-get install -y -t 'stretch-backports*' cmake libsodium-dev
- run: cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON
- run: cmake --build build -j $(nproc)
- run: cmake --build build --target package
- run: cmake --build build -j 2
- run: cmake --build build -j 2 --target package
- store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x86_64}
linux_x86_64_test:
docker:
@ -23,8 +23,8 @@ jobs:
- run: apt-get update -y
- run: apt-get install -y g++ libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev git cmake libsodium-dev libgtest-dev lcov curl
- run: cmake -S. -Bbuild -DRUN_TESTS=ON
- run: cmake --build build -j $(nproc)
- run: cmake --build build -j $(nproc) --target test
- run: cmake --build build -j 2
- run: cmake --build build -j 2 --target test
- run: bash <(curl -s https://codecov.io/bash)
linux_x86_64_sdl1:
docker:
@ -37,8 +37,8 @@ jobs:
- run: apt-get install -y g++ libsdl-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev git rpm
- run: apt-get install -y -t 'stretch-backports*' cmake libsodium-dev
- run: cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON -DUSE_SDL1=ON
- run: cmake --build build -j $(nproc)
- run: cmake --build build --target package
- run: cmake --build build -j 2
- run: cmake --build build -j 2 --target package
- store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x86_64_sdl1}
linux_x86:
docker:
@ -52,8 +52,8 @@ jobs:
- run: apt-get install -y g++-multilib libsdl2-dev:i386 libsdl2-mixer-dev:i386 libsdl2-ttf-dev:i386 libsodium-dev git rpm
- run: apt-get install -y -t 'stretch-backports*' cmake libsodium-dev:i386
- run: cmake -S. -Bbuild -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/32bit.cmake
- run: cmake --build build -j $(nproc)
- run: cmake --build build --target package
- run: cmake --build build -j 2
- run: cmake --build build -j 2 --target package
- store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x86}
windows_x86:
docker:
@ -65,8 +65,8 @@ jobs:
- run: apt-get install -y cmake gcc-mingw-w64-i686 g++-mingw-w64-i686 wget git sudo
- run: Packaging/windows/mingw-prep.sh
- run: cmake -S. -Bbuild -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/mingwcc.cmake
- run: cmake --build build -j $(nproc)
- run: cmake --build build --target package
- run: cmake --build build -j 2
- run: cmake --build build -j 2 --target package
- store_artifacts: {path: ./build/devilutionx.exe, destination: devilutionx_x86.exe}
- store_artifacts: {path: ./build/devilutionx.zip, destination: devilutionx_x86.zip}
windows_x64:
@ -83,8 +83,8 @@ jobs:
- run: DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" apt-get install -y cmake gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 wget git sudo
- run: Packaging/windows/mingw-prep64.sh
- run: cmake -S. -Bbuild -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/mingwcc64.cmake
- run: cmake --build build -j $(nproc)
- run: cmake --build build --target package
- run: cmake --build build -j 2
- run: cmake --build build -j 2 --target package
- store_artifacts: {path: ./build/devilutionx.exe, destination: devilutionx_x64.exe}
- store_artifacts: {path: ./build/devilutionx.zip, destination: devilutionx_x64.zip}
switch:
@ -100,7 +100,7 @@ jobs:
# Install cmake files (https://github.com/devkitPro/docker/issues/3)
- run: dkp-pacman -S --needed --noconfirm --quiet devkitpro-pkgbuild-helpers
- run: cmake -S. -Bbuild .. -DBINARY_RELEASE=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/switch/devkita64-libnx.cmake
- run: cmake --build build -j $(nproc)
- run: cmake --build build -j 2
- store_artifacts: {path: ./build/devilutionx.nro, destination: devilutionx.nro}
3ds:
docker:
@ -119,7 +119,7 @@ jobs:
- run: unzip -j "makerom_016_ctrtool.zip" "Ubuntu/makerom" -d "/opt/devkitpro/tools/bin"
- run: sudo chmod +rx /opt/devkitpro/tools/bin/makerom
- run: cd build && cmake .. -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/3ds.cmake
- run: cd build && cmake --build . -j $(nproc)
- run: cd build && cmake --build . -j 2
- store_artifacts: {path: ./build/devilutionx.3dsx, destination: devilutionx.3dsx}
- store_artifacts: {path: ./build/devilutionx.cia, destination: devilutionx.cia}
amigaos-m68k:
@ -130,7 +130,7 @@ jobs:
- checkout
- run: Packaging/amiga/prep.sh
- run: PKG_CONFIG_PATH=/opt/m68k-amigaos/lib/pkgconfig/:/opt/m68k-amigaos/share/pkgconfig/ cmake -S. -Bbuild -DM68K_CPU=68040 -DM68K_FPU=hard -DM68K_COMMON="-s -ffast-math -O3 -noixemul -D__BIG_ENDIAN__ -D__AMIGA__ -fpermissive" ..
- run: cd build && make -j$(nproc)
- run: cd build && make -j2
- store_artifacts: {path: ./build/devilutionx, destination: devilutionx_m68k}
vita:
docker:
@ -140,7 +140,7 @@ jobs:
- checkout
- run: apk --no-cache add git cmake ninja
- run: cmake -S. -Bbuild -GNinja -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake -DNIGHTLY_BUILD=ON
- run: cmake --build build -j $(nproc)
- run: cmake --build build -j 2
- store_artifacts: {path: ./build/devilutionx.vpk, destination: devilutionx.vpk}
workflows: