Revert "Merge branch 'master' of https://github.com/r4d6/Citadel-Station-13"
This reverts commit95c96ed99c, reversing changes made toa3ee3fe826.
This commit is contained in:
@@ -1,7 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
if [ "$BUILD_TOOLS" = true ]; then
|
||||
cd tgui && source ~/.nvm/nvm.sh && npm install && cd ..
|
||||
fi;
|
||||
|
||||
@@ -1,80 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
#nb: must be bash to support shopt globstar
|
||||
set -e
|
||||
shopt -s globstar
|
||||
|
||||
if [ "$BUILD_TOOLS" = false ]; then
|
||||
if grep -E '^\".+\" = \(.+\)' _maps/**/*.dmm; then
|
||||
echo "Non-TGM formatted map detected. Please convert it using Map Merger!"
|
||||
exit 1
|
||||
fi;
|
||||
if grep -P '^\ttag = \"icon' _maps/**/*.dmm; then
|
||||
echo "tag vars from icon state generation detected in maps, please remove them."
|
||||
exit 1
|
||||
fi;
|
||||
if grep 'step_[xy]' _maps/**/*.dmm; then
|
||||
echo "step_x/step_y variables detected in maps, please remove them."
|
||||
exit 1
|
||||
fi;
|
||||
if grep 'pixel_[xy] = 0' _maps/**/*.dmm; then
|
||||
echo "pixel_x/pixel_y = 0 variables detected in maps, please review to ensure they are not dirty varedits."
|
||||
fi;
|
||||
if grep -P '\td[1-2] =' _maps/**/*.dmm; then
|
||||
echo "d1/d2 cable variables detected in maps, please remove them."
|
||||
exit 1
|
||||
fi;
|
||||
if grep '^/area/.+[\{]' _maps/**/*.dmm; then
|
||||
echo "Vareditted /area path use detected in maps, please replace with proper paths."
|
||||
exit 1
|
||||
fi;
|
||||
if grep '\W\/turf\s*[,\){]' _maps/**/*.dmm; then
|
||||
echo "base /turf path use detected in maps, please replace with proper paths."
|
||||
exit 1
|
||||
fi;
|
||||
if grep '^/*var/' code/**/*.dm; then
|
||||
echo "Unmanaged global var use detected in code, please use the helpers."
|
||||
exit 1
|
||||
fi;
|
||||
if grep -i 'centcomm' code/**/*.dm; then
|
||||
echo "Misspelling(s) of CENTCOM detected in code, please remove the extra M(s)."
|
||||
exit 1
|
||||
fi;
|
||||
if grep -i 'centcomm' _maps/**/*.dmm; then
|
||||
echo "Misspelling(s) of CENTCOM detected in maps, please remove the extra M(s)."
|
||||
exit 1
|
||||
fi;
|
||||
|
||||
source $HOME/BYOND/byond/bin/byondsetup
|
||||
if [ "$BUILD_TESTING" = true ]; then
|
||||
tools/travis/dm.sh -DTRAVISBUILDING -DTRAVISTESTING -DALL_MAPS tgstation.dme
|
||||
else
|
||||
tools/travis/dm.sh -DTRAVISBUILDING tgstation.dme
|
||||
|
||||
tools/deploy.sh travis_test
|
||||
mkdir travis_test/config
|
||||
|
||||
#test config
|
||||
cp tools/travis/travis_config.txt travis_test/config/config.txt
|
||||
|
||||
# get libmariadb, cache it so limmex doesn't get angery
|
||||
if [ -f $HOME/libmariadb ]; then
|
||||
#travis likes to interpret the cache command as it being a file for some reason
|
||||
rm $HOME/libmariadb
|
||||
fi
|
||||
mkdir -p $HOME/libmariadb
|
||||
if [ ! -f $HOME/libmariadb/libmariadb.so ]; then
|
||||
wget http://www.byond.com/download/db/mariadb_client-2.0.0-linux.tgz
|
||||
tar -xvf mariadb_client-2.0.0-linux.tgz
|
||||
mv mariadb_client-2.0.0-linux/libmariadb.so $HOME/libmariadb/libmariadb.so
|
||||
rm -rf mariadb_client-2.0.0-linux.tgz mariadb_client-2.0.0-linux
|
||||
fi
|
||||
|
||||
cd travis_test
|
||||
ln -s $HOME/libmariadb/libmariadb.so libmariadb.so
|
||||
DreamDaemon tgstation.dmb -close -trusted -verbose -params "test-run&log-directory=travis"
|
||||
cd ..
|
||||
cat travis_test/data/logs/travis/clean_run.lk
|
||||
|
||||
fi;
|
||||
fi;
|
||||
@@ -1,55 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
|
||||
source dependencies.sh
|
||||
|
||||
#ensure the Dockerfile version matches the dependencies.sh version
|
||||
line=$(head -n 1 Dockerfile)
|
||||
if [[ $line != *"$BYOND_MAJOR.$BYOND_MINOR"* ]]; then
|
||||
echo "Dockerfile BYOND version in FROM command does not match dependencies.sh (Or it's not on line 1)!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ $BUILD_TOOLS = false ] && [ $BUILD_TESTING = false ]; then
|
||||
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-host i686-unknown-linux-gnu
|
||||
source ~/.profile
|
||||
|
||||
mkdir rust-g
|
||||
cd rust-g
|
||||
git init
|
||||
git remote add origin https://github.com/tgstation/rust-g
|
||||
git fetch --depth 1 origin $RUST_G_VERSION
|
||||
git checkout FETCH_HEAD
|
||||
cargo build --release
|
||||
cmp target/rust_g.dm ../code/__DEFINES/rust_g.dm
|
||||
|
||||
mkdir -p ~/.byond/bin
|
||||
ln -s $PWD/target/release/librust_g.so ~/.byond/bin/rust_g
|
||||
|
||||
mkdir -p ../BSQL/artifacts
|
||||
cd ../BSQL
|
||||
git init
|
||||
git remote add origin https://github.com/tgstation/BSQL
|
||||
git fetch --depth 1 origin $BSQL_VERSION
|
||||
git checkout FETCH_HEAD
|
||||
|
||||
if [ -f "$HOME/MariaDB/libmariadb.so.2" ] && [ -f "$HOME/MariaDB/libmariadb.so" ] && [ -d "$HOME/MariaDB/include" ];
|
||||
then
|
||||
echo "Using cached MariaDB library."
|
||||
else
|
||||
echo "Setting up MariaDB."
|
||||
rm -rf "$HOME/MariaDB"
|
||||
mkdir -p "$HOME/MariaDB"
|
||||
mkdir -p "$HOME/MariaDB/include"
|
||||
cp /usr/lib/i386-linux-gnu/libmariadb.so.2 $HOME/MariaDB/
|
||||
ln -s $HOME/MariaDB/libmariadb.so.2 $HOME/MariaDB/libmariadb.so
|
||||
cp -r /usr/include/mariadb $HOME/MariaDB/include/
|
||||
fi
|
||||
|
||||
cd artifacts
|
||||
export CXX=g++-7
|
||||
cmake .. -DMARIA_INCLUDE_DIR=$HOME/MariaDB/include
|
||||
make
|
||||
mv src/BSQL/libBSQL.so ../../
|
||||
fi
|
||||
@@ -1,16 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
#must also be bash for the md5sum commands
|
||||
set -e
|
||||
|
||||
if [ "$BUILD_TOOLS" = true ];
|
||||
then
|
||||
md5sum -c - <<< "49bc6b1b9ed56c83cceb6674bd97cb34 *html/changelogs/example.yml";
|
||||
(cd tgui && source ~/.nvm/nvm.sh && npm ci && node node_modules/gulp/bin/gulp.js --min)
|
||||
phpenv global 5.6
|
||||
php -l tools/WebhookProcessor/github_webhook_processor.php;
|
||||
php -l tools/TGUICompiler.php;
|
||||
echo "Checking for JSON errors";
|
||||
find . -name "*.json" -not -path "./tgui/node_modules/*" | xargs -0 python3 ./tools/json_verifier.py;
|
||||
python3 tools/ss13_genchangelog.py html/changelog.html html/changelogs;
|
||||
fi;
|
||||
Regular → Executable
Reference in New Issue
Block a user