CI2 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

vode-code wants to merge 47 commits into master from CI2

.github/workflows/ci_suite.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -10,12 +10,22 @@ jobs:
  
      run_linters:

        if: "!contains(github.event.head_commit.message, '[ci skip]')"

        name: Run Linters

        runs-on: ubuntu-20.04

        runs-on: ubuntu-24.04

        concurrency:

          group: run_linters-${{ github.ref }}

          cancel-in-progress: true

        steps:

          - uses: actions/checkout@v3

          - name: Update apt and install dependencies

            run: |

              sudo apt-get update

              sudo apt-get install -y libgit2-dev libjpeg62 libjpeg62-dev libpng-dev

          - uses: actions/setup-python@v5

            with:

              python-version: '3.11'

              cache: 'pip'

              cache-dependency-path: 'tools/requirements.txt'

          - uses: actions/checkout@v3

          - name: Restore SpacemanDMM cache

            uses: actions/cache@v3

            with:

    @@ -32,10 +42,9 @@ jobs:
  
                ${{ runner.os }}-

          - name: Install Tools

            run: |

              pip3 install setuptools

              pip install -r tools/requirements.txt

              bash tools/ci/install_node.sh

              bash tools/ci/install_spaceman_dmm.sh dreamchecker

              tools/bootstrap/python -c ''

          - name: Run Linters

            run: |

              bash tools/ci/check_filedirs.sh cev_eris.dme

    @@ -56,7 +65,7 @@ jobs:
  
      compile_all_maps:

        if: "!contains(github.event.head_commit.message, '[ci skip]')"

        name: Compile Maps

        runs-on: ubuntu-20.04

        runs-on: ubuntu-24.04

        concurrency:

          group: compile_all_maps-${{ github.ref }}

          cancel-in-progress: true

    @@ -76,7 +85,7 @@ jobs:
  
      run_all_tests:

        if: "!contains(github.event.head_commit.message, '[ci skip]')"

        name: Integration Tests

        runs-on: ubuntu-20.04

        runs-on: ubuntu-24.04

        services:

          mysql:

            image: mysql:latest

    @@ -102,9 +111,6 @@ jobs:
  
              mysql -u root -proot tg_ci < schema.sql

          - name: Install rust-g

            run: |

              sudo dpkg --add-architecture i386

              sudo apt update || true

              sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386

              bash tools/ci/install_rust_g.sh

          - name: Compile Tests

            run: |

    @@ -127,7 +133,7 @@ jobs:
  
        if: "!contains(github.event.head_commit.message, '[ci skip]') && always()"

        needs: [run_all_tests]

        name: Compare Screenshot Tests

        runs-on: ubuntu-20.04

        runs-on: ubuntu-24.04

        steps:

          - uses: actions/checkout@v3

          # If we ever add more artifacts, this is going to break, but it'll be obvious.

cev_eris.dme

-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ @@
     #include "code\__DEFINES\craft.dm"
     #include "code\__DEFINES\cyborg_traits.dm"
     #include "code\__DEFINES\damage_organs.dm"
+    #include "code\__DEFINES\database.dm"
     #include "code\__DEFINES\economy.dm"
     #include "code\__DEFINES\error_handler.dm"
     #include "code\__DEFINES\flags.dm"
@@ Expand Down Expand Up / @@ -226,6 +227,7 @@ @@
     #include "code\controllers\subsystems\chemistry.dm"
     #include "code\controllers\subsystems\chunks.dm"
     #include "code\controllers\subsystems\craft.dm"
+    #include "code\controllers\subsystems\database.dm"
     #include "code\controllers\subsystems\dcs.dm"
     #include "code\controllers\subsystems\economy.dm"
     #include "code\controllers\subsystems\evac.dm"
@@ Expand Down Expand Up / @@ -527,7 +529,6 @@ @@
     #include "code\defines\obj.dm"
     #include "code\defines\procs\announce.dm"
     #include "code\defines\procs\AStar.dm"
-    #include "code\defines\procs\dbcore.dm"
     #include "code\defines\procs\hud.dm"
     #include "code\defines\procs\radio.dm"
     #include "code\defines\procs\sd_Alert.dm"
@@ Expand Down Expand Up / @@ -1425,6 +1426,7 @@ @@
     #include "code\modules\admin\verbs\possess.dm"
     #include "code\modules\admin\verbs\pray.dm"
     #include "code\modules\admin\verbs\randomverbs.dm"
+    #include "code\modules\admin\verbs\reestablish_db_connection.dm"
     #include "code\modules\admin\verbs\ticklag.dm"
     #include "code\modules\admin\verbs\tripAI.dm"
     #include "code\modules\admin\verbs\SDQL_2\SDQL_2.dm"
@@ Expand Down @@

code/__DEFINES/database.dm

-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    /// When a query has been queued up for execution/is being executed
+    #define DB_QUERY_STARTED 0
+    /// When a query is finished executing
+    #define DB_QUERY_FINISHED 1
+    /// When there was a problem with the execution of a query.
+    #define DB_QUERY_BROKEN 2

code/__DEFINES/subsystems-priority.dm

-Original file line number
+Diff line change
@@ Expand Up @@
     #define SS_PRIORITY_TICKER			200	// Gameticker processing.
     #define FIRE_PRIORITY_TGUI 110
     #define FIRE_PRIORITY_EXPLOSIONS 105 // Explosions!
-    #define FIRE_PRIORITY_THROWING 106 // Throwing! after explosions since they influence throw direction
+    #define FIRE_PRIORITY_DATABASE 104
+    #define FIRE_PRIORITY_THROWING 103 // Throwing! after explosions since they influence throw direction
     #define SS_PRIORITY_HUMAN			101	// Human Life().
     #define SS_PRIORITY_MOB				100	// Non-human Mob Life().
     #define SS_PRIORITY_CHAT			100 // Chat subsystem.
@@ Expand Down @@

code/__DEFINES/subsystems.dm

-Original file line number
+Diff line change
@@ -1,4 +1,13 @@
+    //! ## DB defines
+    /**
+     * DB schema version
+     *
+     * Update this whenever the db schema changes
+     */
+    #define DB_SCHEMA_VERSION 1
     //! ## Timing subsystem
     /**
      * Don't run if there is an identical unique timer active
@@ Expand Down Expand Up / @@ -88,6 +97,7 @@ @@
     // The numbers just define the ordering, they are meaningless otherwise.
     #define INIT_ORDER_GARBAGE 99
+    #define INIT_ORDER_DBCORE 98
     #define INIT_ORDER_EXPLOSIONS 97
     #define INIT_ORDER_STATPANELS 96
     #define INIT_ORDER_MAPPING 15
@@ Expand Down @@

code/__HELPERS/text.dm

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,10 +13,8 @@ @@
      * SQL sanitization
      */
-    // Run all strings to be used in an SQL query through this proc first to properly escape out injection attempts.
-    /proc/sanitizeSQL(var/t as text)
-    	var/sqltext = dbcon.Quote(t);
-    	return copytext(sqltext, 2, length(sqltext));//Quote() adds quotes around input, we already do that
+    /proc/format_table_name(table as text)
+    	return sql_tableprefix + table
     /*
      * Text sanitization
@@ Expand Down @@

code/controllers/configuration.dm

-Original file line number
+Diff line change
@@ Expand Up / @@ -249,6 +249,7 @@ GLOBAL_LIST_EMPTY(storyteller_cache) @@
     /datum/configuration/proc/load(filename, type = "config") //the type can also be game_options, in which case it uses a different switch. not making it separate to not copypaste code - Urist
     	var/list/Lines = file2list(filename)
+    	world.log << "loading [filename]"
     	for(var/t in Lines)
     		if(!t)	continue
@@ Expand Down Expand Up / @@ -779,6 +780,7 @@ GLOBAL_LIST_EMPTY(storyteller_cache) @@
     /datum/configuration/proc/loadsql(filename)  // -- TLE
     	var/list/Lines = file2list(filename)
+    	world.log << "loading [filename]"
     	for(var/t in Lines)
     		if(!t)	continue
@@ Expand All / @@ -805,13 +807,25 @@ GLOBAL_LIST_EMPTY(storyteller_cache) @@
     			if ("address")
     				sqladdress = value
     			if ("port")
-    				sqlport = value
+    				sqlport = text2num(value)
     			if ("database")
     				sqldb = value
     			if ("login")
     				sqllogin = value
     			if ("password")
     				sqlpass = value
+    			if ("sql_tableprefix")
+    				sql_tableprefix = value
+    			if ("async_query_timeout")
+    				sql_async_query_timeout = text2num(value)
+    			if ("blocking_query_timeout")
+    				sql_blocking_query_timeout = text2num(value)
+    			if ("pooling_min_sql_connections")
+    				sql_pooling_min_sql_connections = text2num(value)
+    			if ("pooling_max_sql_connections")
+    				sql_pooling_max_sql_connections = text2num(value)
+    			if ("max_concurrent_queries")
+    				sql_max_concurrent_queries = text2num(value)
     			else
     				log_misc("Unknown setting in configuration: '[name]'")
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CI2 #2

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!