Merge pull request #8641 from Ghommie/Ghommie-cit47

port "PR to make travis use xenial and to make it work"

.travis.yml

@@ -1,5 +1,6 @@
 language: generic
 sudo: false
+dist: xenial
 branches:
   except:
   - ___TGS3TempBranch
@@ -14,6 +15,7 @@ matrix:
           packages:
             - python3
             - python3-pip
+            - python3-setuptools
       cache:
         directories:
           - tgui/node_modules
@@ -43,7 +45,8 @@ matrix:
             - gcc-multilib
             - g++-7
             - g++-7-multilib
-            - libmariadbclient-dev:i386
+            - libmariadb-client-lgpl-dev:i386
+            - libmariadbd-dev
       cache:
         directories:
           - $HOME/.cargo

tools/ss13_genchangelog.py

@@ -74,7 +74,7 @@ failed_cache_read = True
 if os.path.isfile(changelog_cache):
     try:
         with open(changelog_cache,encoding='utf-8') as f:
-            (_, all_changelog_entries) = yaml.load_all(f)
+            (_, all_changelog_entries) = yaml.load_all(f, Loader=yaml.SafeLoader)
             failed_cache_read = False
 
             # Convert old timestamps to newer format.
@@ -142,7 +142,7 @@ for fileName in glob.glob(os.path.join(args.ymlDir, "*.yml")):
     print(' Reading {}...'.format(fileName))
     cl = {}
     with open(fileName, 'r',encoding='utf-8') as f:
-        cl = yaml.load(f)
+        cl = yaml.load(f, Loader=yaml.SafeLoader)
         f.close()
     if today not in all_changelog_entries:
         all_changelog_entries[today] = {}

tools/travis/build_dependencies.sh

@@ -41,19 +41,10 @@ if [ $BUILD_TOOLS = false ] && [ $BUILD_TESTING = false ]; then
         echo "Setting up MariaDB."
         rm -rf "$HOME/MariaDB"
         mkdir -p "$HOME/MariaDB"
-        wget http://mirrors.kernel.org/ubuntu/pool/universe/m/mariadb-client-lgpl/libmariadb2_2.0.0-1_i386.deb
+		mkdir -p "$HOME/MariaDB/include"
-        dpkg -x libmariadb2_2.0.0-1_i386.deb /tmp/extract
+        cp /usr/lib/i386-linux-gnu/libmariadb.so.2 $HOME/MariaDB/
-        rm libmariadb2_2.0.0-1_i386.deb
+		ln -s $HOME/MariaDB/libmariadb.so.2 $HOME/MariaDB/libmariadb.so
-        mv /tmp/extract/usr/lib/i386-linux-gnu/libmariadb.so.2 $HOME/MariaDB/
+        cp -r /usr/include/mariadb $HOME/MariaDB/include/
-        ln -s $HOME/MariaDB/libmariadb.so.2 $HOME/MariaDB/libmariadb.so
-        rm -rf /tmp/extract
-
-        wget http://mirrors.kernel.org/ubuntu/pool/universe/m/mariadb-connector-c/libmariadb-dev_2.3.3-1_i386.deb
-        dpkg -x libmariadb-dev_2.3.3-1_i386.deb /tmp/extract
-        rm libmariadb-dev_2.3.3-1_i386.deb
-        mv /tmp/extract/usr/include $HOME/MariaDB/
-        #fuck what is this even?
-        mv $HOME/MariaDB/include/mariadb $HOME/MariaDB/include/mysql
     fi
 
     cd artifacts

tools/travis/install_build_tools.sh

@@ -4,9 +4,8 @@ set -e
 source dependencies.sh
 
 if [ "$BUILD_TOOLS" = true ]; then
-      rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $NODE_VERSION
+      source ~/.nvm/nvm.sh
-      pip3 install --user PyYaml -q
+      nvm install $NODE_VERSION
-      pip3 install --user beautifulsoup4 -q
+      pip3 install --user PyYaml
+      pip3 install --user beautifulsoup4
 fi;
-
-