Travis Musings (#5116)

Bumps Flyway.
Moves a script that should be a code check to the code checks.

.travis.yml

@@ -4,7 +4,7 @@ sudo: false
 env:
   global:
     BYOND_MAJOR="512"
-    BYOND_MINOR="1453"
+    BYOND_MINOR="1454"
     MACRO_COUNT=77
     FLYWAY_BUILD="5.1.4"
     NODE_VERSION=10
@@ -36,13 +36,11 @@ node_js:
   - "10"
 
 install:
-  - pip install --user PyYaml -q
-  - pip install --user beautifulsoup4 -q
   - mysql -e 'CREATE DATABASE ss13_test;'
-  - chmod +x ./install-byond.sh
+  - chmod +x ./scripts/install-byond.sh
-  - ./install-byond.sh
+  - ./scripts/install-byond.sh
-  - chmod +x ./install-flyway.sh
+  - chmod +x ./scripts/install-flyway.sh
-  - ./install-flyway.sh
+  - ./scripts/install-flyway.sh
   - export LD_LIBRARY_PATH=./:$HOME/rust_g-$RUST_G_VERSION:$LD_LIBRARY_PATH
   - shopt -s globstar
   - chmod +x ./scripts/rust_g.sh
@@ -54,8 +52,7 @@ stages:
 
 
 script:
-  - $HOME/flyway-${FLYWAY_BUILD}/flyway migrate -user=root -password= -url=jdbc:mysql://localhost:3306/ss13_test
+  - $HOME/flyway-${FLYWAY_BUILD}/flyway migrate -user=root -password= -url=jdbc:mariadb://localhost:3306/ss13_test
-  - python tools/GenerateChangelog/ss13_genchangelog.py html/changelog.html html/changelogs --dry-run
   - source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup
   - cp config/example/* config/
   - scripts/dm.sh -DUNIT_TEST -M$USE_MAP aurorastation.dme
@@ -68,6 +65,8 @@ jobs:
   include:
     - stage: code check
       install:
+        - pip install --user PyYaml -q
+        - pip install --user beautifulsoup4 -q
         - chmod +x ./vueui/install
         - ./vueui/install
         - chmod +x ./scripts/rust_g.sh
@@ -84,3 +83,4 @@ jobs:
         - md5sum -c - <<< "94c0d540b3b0f008fbc4353e667de690 *html/changelogs/example.yml"
         - md5sum -c - <<< "51704c822012212faa577079db2e11fd *vueui/template.html"
         - python tools/TagMatcher/tag-matcher.py ../..
+        - python tools/GenerateChangelog/ss13_genchangelog.py html/changelog.html html/changelogs --dry-run

code/controllers/configuration.dm

@@ -223,9 +223,7 @@ var/list/gamemode_cache = list()
 	var/client_error_message = ""
 	var/client_warn_version = 0
 	var/client_warn_message = ""
-#if DM_VERSION > 511
 	var/list/client_blacklist_version = list()
-#endif
 
 	//Mark-up enabling
 	var/allow_chat_markup = 0
@@ -775,10 +773,8 @@ var/list/gamemode_cache = list()
 				if("client_warn_message")
 					config.client_warn_message = value
 
-#if DM_VERSION > 511
 				if("client_blacklist_version")
 					config.client_blacklist_version = splittext(value, ";")
-#endif
 
 				if("allow_chat_markup")
 					config.allow_chat_markup = 1

code/global.dm

@@ -1,6 +1,6 @@
 //#define TESTING
-#if DM_VERSION < 511
+#if DM_VERSION < 512
-#error Your version of BYOND is too old to compile the code. At least BYOND 511 is required.
+#error Your version of BYOND is too old to compile the code. At least BYOND 512 is required.
 #endif
 
 

code/modules/client/client procs.dm

@@ -347,7 +347,6 @@
 			del(src)
 			return 0
 
-#if DM_VERSION > 511
 	if (LAZYLEN(config.client_blacklist_version))
 		var/client_version = "[byond_version].[byond_build]"
 		if (client_version in config.client_blacklist_version)
@@ -357,7 +356,6 @@
 			log_access("Failed Login: [key] [computer_id] [address] - Blacklisted BYOND version: [client_version].")
 			del(src)
 			return 0
-#endif
 
 	//preferences datum - also holds some persistant data for the client (because we may as well keep these datums to a minimum)
 	prefs = preferences_datums[ckey]
@@ -483,12 +481,7 @@
 	var/sql_computerid = sql_sanitize_text(src.computer_id)
 	var/sql_admin_rank = sql_sanitize_text(admin_rank)
 	var/sql_byond_version = text2num(byond_version)
-	#if DM_VERSION >= 512
 	var/sql_byond_build = text2num(byond_build)
-	#else
-	var/sql_byond_build = 0
-	#endif
-
 
 	if(found)
 		//Player already identified previously, we need to just update the 'lastseen', 'ip', 'computer_id', 'byond_version' and 'byond_build' variables