Skip to content

Commit

Permalink
! prevent some already defined error notices in testbed
Browse files Browse the repository at this point in the history
! prevent duplicate key notice in testbed
  • Loading branch information
Spuds committed Jan 16, 2023
1 parent 609496c commit f13c98a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions .github/SetupDbUtil.php
Expand Up @@ -232,13 +232,13 @@ public function update()
global $ssi_db_user, $scripturl, $ssi_db_passwd, $db_passwd;
global $sourcedir, $boarddir;

DEFINE('SUBSDIR', BOARDDIR . '/sources/subs');
DEFINE('EXTDIR', BOARDDIR . '/sources/ext');
DEFINE('SOURCEDIR', BOARDDIR . '/sources');
DEFINE('LANGUAGEDIR', BOARDDIR . '/themes/default/languages');
DEFINE('ADMINDIR', SOURCEDIR . '/admin');
DEFINE('CONTROLLERDIR', SOURCEDIR . '/controllers');
DEFINE('ADDONSDIR', SOURCEDIR . '/addons');
defined('SUBSDIR') || DEFINE('SUBSDIR', BOARDDIR . '/sources/subs');
defined('EXTDIR') || DEFINE('EXTDIR', BOARDDIR . '/sources/ext');
defined('SOURCEDIR') || DEFINE('SOURCEDIR', BOARDDIR . '/sources');
defined('LANGUAGEDIR') || DEFINE('LANGUAGEDIR', BOARDDIR . '/themes/default/languages');
defined('ADMINDIR') || DEFINE('ADMINDIR', SOURCEDIR . '/admin');
defined('CONTROLLERDIR') || DEFINE('CONTROLLERDIR', SOURCEDIR . '/controllers');
defined('ADDONSDIR') || DEFINE('ADDONSDIR', SOURCEDIR . '/addons');

require_once(BOARDDIR . '/Settings.php');
require_once(SOURCEDIR . '/Subs.php');
Expand Down Expand Up @@ -286,7 +286,7 @@ public function update()

if (date_default_timezone_set($timezone_id))
{
$db->insert('',
$db->insert('replace',
$db_prefix . 'settings',
array(
'variable' => 'string-255', 'value' => 'string-65534',
Expand Down
8 changes: 4 additions & 4 deletions .github/setup-failure.sh
Expand Up @@ -12,7 +12,7 @@ DB=$1
PHP_VERSION=$2

# Agents will merge all coverage data...
if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]
then
bash <(curl -s https://codecov.io/bash) -s "/tmp" -f '*.clover'
fi
#if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]
#then
# bash <(curl -s https://codecov.io/bash) -s "/tmp" -f '*.clover'
#fi

0 comments on commit f13c98a

Please sign in to comment.