Skip to content

Commit

Permalink
Merge pull request #71 from acquia/ACMS-4134
Browse files Browse the repository at this point in the history
ACMS-4134: Add mysql57 backport module to DRS.
  • Loading branch information
vishalkhode1 authored Sep 24, 2024
2 parents 60a053a + 0a40596 commit 691c63f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
17 changes: 6 additions & 11 deletions .github/workflows/drs_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: 8.2
php-version: 8.3
coverage: xdebug
- name: Download ORCA
run: composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n
Expand All @@ -53,21 +53,16 @@ jobs:
matrix:
php-version:
- 8.1
- 8.2
- 8.3
orca-job:
- ISOLATED_TEST_ON_CURRENT
- INTEGRATED_TEST_ON_PREVIOUS_MINOR
- ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
# - INTEGRATED_TEST_ON_PREVIOUS_MINOR
- INTEGRATED_TEST_ON_LATEST_LTS
exclude:
- orca-job: INTEGRATED_TEST_ON_PREVIOUS_MINOR
php-version: 8.3
- orca-job: INTEGRATED_TEST_ON_PREVIOUS_MINOR
php-version: 8.2
- orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
# - orca-job: INTEGRATED_TEST_ON_PREVIOUS_MINOR
# php-version: 8.1
- orca-job: ISOLATED_TEST_ON_CURRENT
php-version: 8.1
- orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
php-version: 8.2
env:
ORCA_JOB: ${{ matrix.orca-job }}
CI: TRUE
Expand Down
7 changes: 7 additions & 0 deletions settings/acquia-recommended.settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,13 @@

$settings_files = [];

// Add mysql57 backport module.
if (file_exists(DRUPAL_ROOT . '/modules/contrib/mysql57/settings.inc')) {
global $conf, $databases;
$conf['acquia_hosting_settings_autoconnect'] = FALSE;
require DRUPAL_ROOT . '/modules/contrib/mysql57/settings.inc';
}

/**
* Site path.
*
Expand Down

0 comments on commit 691c63f

Please sign in to comment.