Remove cloning of Dota 2 SDK in CI

SourceMod doesn't support Source 1 Dota 2 anymore and neither Source 2. Speed up CI by only cloning the hl2sdks that are tested.

This adds a `-s sdk1,sdk2` parameter to the checkout-deps.sh script similar to the `-SDKs` option of the powershell script to select specific sdks to update instead of all.
This commit is contained in:
Peace-Maker 2020-07-30 15:36:24 +02:00 committed by David Anderson
parent af76f757b5
commit 37355f9c57
3 changed files with 28 additions and 15 deletions

View File

@ -18,7 +18,7 @@ jobs:
packages: ['clang-3.8', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev:i386', 'g++-4.9-multilib'] packages: ['clang-3.8', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev:i386', 'g++-4.9-multilib']
env: env:
- MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8" - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
- SDKS=episode1,css,tf2,l4d2,csgo,dota - SDKS=episode1,css,tf2,l4d2,csgo
- MODE=optimize - MODE=optimize
- ARCH=x86,x64 - ARCH=x86,x64
@ -32,7 +32,7 @@ jobs:
packages: ['clang-3.4', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev:i386', 'g++-4.9-multilib'] packages: ['clang-3.4', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev:i386', 'g++-4.9-multilib']
env: env:
- MATRIX_EVAL="CC=clang && CXX=clang++" - MATRIX_EVAL="CC=clang && CXX=clang++"
- SDKS=episode1,css,tf2,l4d2,csgo,dota - SDKS=episode1,css,tf2,l4d2,csgo
- MODE=optimize - MODE=optimize
- ARCH=x86,x64 - ARCH=x86,x64
@ -41,7 +41,7 @@ jobs:
language: cpp language: cpp
env: env:
- MATRIX_EVAL="CC=clang && CXX=clang++" - MATRIX_EVAL="CC=clang && CXX=clang++"
- SDKS=episode1,css,tf2,l4d2,csgo,dota - SDKS=episode1,css,tf2,l4d2,csgo
- MODE=optimize - MODE=optimize
- ARCH=x64,x86 - ARCH=x64,x86
@ -75,7 +75,7 @@ jobs:
- ARCH=x86 - ARCH=x86
before_script: before_script:
- CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/tools/checkout-deps.sh && cd $CHECKOUT_DIR - CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/tools/checkout-deps.sh -s ${SDKS} && cd $CHECKOUT_DIR
script: script:
- mkdir build && cd build - mkdir build && cd build
- PATH="~/.local/bin:$PATH" - PATH="~/.local/bin:$PATH"

View File

@ -6,11 +6,11 @@ install:
- cmd: git submodule update --init --recursive - cmd: git submodule update --init --recursive
- cmd: git pull --recurse-submodules - cmd: git pull --recurse-submodules
- cmd: cd .. - cmd: cd ..
- ps: sourcemod/tools/checkout-deps.ps1 -SDKs episode1,css,tf2,l4d2,csgo,dota - ps: sourcemod/tools/checkout-deps.ps1 -SDKs episode1,css,tf2,l4d2,csgo
- cmd: cd sourcemod - cmd: cd sourcemod
build_script: build_script:
- cmd: call "%VS140COMNTOOLS%/vsvars32.bat" - cmd: call "%VS140COMNTOOLS%/vsvars32.bat"
- cmd: mkdir build - cmd: mkdir build
- cmd: cd build - cmd: cd build
- cmd: c:\python27\python.exe ../configure.py --enable-optimize --no-mysql --sdks=episode1,css,tf2,l4d2,csgo,dota - cmd: c:\python27\python.exe ../configure.py --enable-optimize --no-mysql --sdks=episode1,css,tf2,l4d2,csgo
- cmd: ambuild - cmd: ambuild

View File

@ -3,6 +3,17 @@
trap "exit" INT trap "exit" INT
# List of HL2SDK branch names to download.
# ./checkout-deps.sh -s tf2,css
while getopts ":s:" opt; do
case $opt in
s) IFS=', ' read -r -a sdks <<< "$OPTARG"
;;
\?) echo "Invalid option -$OPTARG" >&2
;;
esac
done
ismac=0 ismac=0
iswin=0 iswin=0
@ -97,15 +108,17 @@ repo="https://github.com/alliedmodders/metamod-source"
origin= origin=
checkout checkout
sdks=( csgo hl2dm nucleardawn l4d2 dods l4d css tf2 insurgency sdk2013 doi ) if [ -z ${sdks+x} ]; then
sdks=( csgo hl2dm nucleardawn l4d2 dods l4d css tf2 insurgency sdk2013 doi )
if [ $ismac -eq 0 ]; then
# Add these SDKs for Windows or Linux if [ $ismac -eq 0 ]; then
sdks+=( orangebox blade episode1 bms ) # Add these SDKs for Windows or Linux
sdks+=( orangebox blade episode1 bms )
# Add more SDKs for Windows only
if [ $iswin -eq 1 ]; then # Add more SDKs for Windows only
sdks+=( darkm swarm bgt eye contagion ) if [ $iswin -eq 1 ]; then
sdks+=( darkm swarm bgt eye contagion )
fi
fi fi
fi fi