Merge branch 'master' into dependabot/composer/mediawiki/mediawiki-co…

…desniffer-42.0.0
WikiTideOrg · Dec 5, 2023 · e0754ad · e0754ad
2 parents 322bbc9 + 0c8b956
commit e0754ad
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/globals.php b/.github/workflows/globals.php
@@ -7,12 +7,18 @@
 
 function wfOnMediaWikiServices( MediaWikiServices $services ) {
 	try {
-		global $IP;
-		$dbw = wfInitDBConnection();
+		if ( getenv( 'ECHO_SQL_EXECUTED' ) ) {
+			return;
+		}
+
+		$db = wfInitDBConnection();
 
-		if ( !$dbw->tableExists( 'echo_unread_wikis' ) ) {
-			$dbw->sourceFile( "$IP/extensions/Echo/sql/mysql/tables-sharedtracking-generated.sql" );
+		$db->selectDomain( 'wikidb' );
+		if ( !$db->tableExists( 'echo_unread_wikis' ) ) {
+			$db->sourceFile( MW_INSTALL_PATH . '/extensions/Echo/sql/mysql/tables-sharedtracking-generated.sql' );
 		}
+
+		putenv( 'ECHO_SQL_EXECUTED=true' );
 	} catch ( DBQueryError $e ) {
 		return;
 	}

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -18,7 +18,7 @@ jobs:
       matrix:
         python: ['3.9', '3.10']
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Python ${{ matrix.python }}