diff --git a/bin/ci/_includes.sh b/bin/ci/_includes.sh index 245a9751d..9357c8891 100755 --- a/bin/ci/_includes.sh +++ b/bin/ci/_includes.sh @@ -73,6 +73,8 @@ export DRUPAL_TEST_DB_URL="sqlite://localhost/sites/default/files/db.sqlite" export DRUPAL_TEST_WEBDRIVER_CHROME_ARGS="--disable-gpu --headless --no-sandbox" export DRUPAL_TEST_WEBDRIVER_HOSTNAME="localhost" export DRUPAL_TEST_WEBDRIVER_PORT="4444" +export SITESTUDIO_API_KEY="key-cohesion-baseline" +export SITESTUDIO_ORG_KEY="test-cohesion-baseline" if [[ ! "$ORCA_TEMP_DIR" ]]; then # GitHub Actions. diff --git a/config/services.yml b/config/services.yml index d7215be9e..595203ec7 100644 --- a/config/services.yml +++ b/config/services.yml @@ -14,8 +14,6 @@ parameters: env(ORCA_PHPCS_STANDARD): "AcquiaDrupalTransitional" env(ORCA_TELEMETRY_ENABLE): "false" env(ORCA_IS_ALLOWED_FAILURE): "%env(ORCA_IS_ALLOWED_FAILURE)%" - env(SITESTUDIO_API_KEY): "key-cohesion-baseline" - env(SITESTUDIO_ORG_KEY): "test-cohesion-baseline" services: diff --git a/src/Domain/Fixture/FixtureCreator.php b/src/Domain/Fixture/FixtureCreator.php index ced2303dc..0467226bd 100644 --- a/src/Domain/Fixture/FixtureCreator.php +++ b/src/Domain/Fixture/FixtureCreator.php @@ -943,7 +943,7 @@ private function setUpFilesDirectories(): void { * Runs ACMS commands. */ public function runAcmsCommands(): void { - if($this->fixtureInspector->getInstalledPackageVersionPretty('acquia/acquia_cms') === '~'){ + if ($this->fixtureInspector->getInstalledPackageVersionPretty('acquia/acquia_cms') === '~') { return; } $this->output->section('Run ACMS Site Build'); diff --git a/src/Enum/EnvVarEnum.php b/src/Enum/EnvVarEnum.php index ba2698d6f..610bbf5c0 100644 --- a/src/Enum/EnvVarEnum.php +++ b/src/Enum/EnvVarEnum.php @@ -33,6 +33,8 @@ * @method static EnvVarEnum DRUPAL_TEST_WEBDRIVER_CHROME_ARGS() * @method static EnvVarEnum DRUPAL_TEST_WEBDRIVER_HOSTNAME() * @method static EnvVarEnum DRUPAL_TEST_WEBDRIVER_PORT() + * @method static EnvVarEnum SITESTUDIO_API_KEY() + * @method static EnvVarEnum SITESTUDIO_ORG_KEY() */ class EnvVarEnum extends Enum { @@ -93,6 +95,10 @@ class EnvVarEnum extends Enum { public const DRUPAL_TEST_WEBDRIVER_HOSTNAME = 'DRUPAL_TEST_WEBDRIVER_HOSTNAME'; public const DRUPAL_TEST_WEBDRIVER_PORT = 'DRUPAL_TEST_WEBDRIVER_PORT'; + public const SITESTUDIO_API_KEY = 'SITESTUDIO_API_KEY'; + public const SITESTUDIO_ORG_KEY = 'SITESTUDIO_ORG_KEY'; + + /** * Descriptions for the environment variables. @@ -131,6 +137,8 @@ public static function descriptions(): array { self::DRUPAL_TEST_WEBDRIVER_CHROME_ARGS => 'The Chrome WebDriver arguments (Read-only)', self::DRUPAL_TEST_WEBDRIVER_HOSTNAME => 'The WebDriver hostname (Read-only)', self::DRUPAL_TEST_WEBDRIVER_PORT => 'The WebDriver port (Read-only)', + self::SITESTUDIO_API_KEY => 'The Site Studio API Key', + self::SITESTUDIO_ORG_KEY => 'The Site Studio ORG Key', ]; }