Skip to content
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

Initial commit removing mariadb #101

Merged
merged 3 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})

* Remove option of using MariaDB - It doesn't work and Acquia doesn't support it.

## v1.3.0 - [April 19, 2024](https://github.com/lando/acquia/releases/tag/v1.3.0)

**NOTICE:** If you use the default PHP version, it is now being updated to PHP 8.2. You may need to specify your PHP version in `.lando.yml`, for example, to set it to PHP 8.0:
Expand Down
4 changes: 2 additions & 2 deletions builders/acquia-base.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const getConfigDefaults = options => {
const dbConfig = getDatabaseType(options);
const database = _.first(dbConfig.split(':'));
const version = _.last(dbConfig.split(':')).substring(0, 2);
if (database.includes('mysql') || database.includes('mariadb')) {
if (database.includes('mysql')) {
if (version === '8.') {
options.defaultFiles.database = 'mysql8.cnf';
} else {
Expand Down Expand Up @@ -158,7 +158,7 @@ const getDbTooling = database => {
// Make sure we strip out any version number
database = database.split(':')[0];
// Choose wisely
if (_.includes(['mysql', 'mariadb'], database)) {
if (_.includes(['mysql'], database)) {
return {mysql: mysqlCli};
} else if (database === 'postgres') {
return {psql: postgresCli};
Expand Down
15 changes: 0 additions & 15 deletions builders/acquia-mariadb.js

This file was deleted.

8 changes: 4 additions & 4 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ npm run test:unit

### Leia Tests

We do end to end testing with our made-just-for-Lando testing framework [Leia](https://github.com/lando/leia). Leia allows us to define tests as a series of commented shell commands in human readable markdown files. Here is a simple example:
We do end to end testing with our made-just-for-Lando testing framework [Leia](https://github.com/lando/leia). Leia allows us to define tests as a series of commented shell commands in human-readable markdown files. Here is a simple example:

```md
Start up tests
Expand All @@ -101,8 +101,8 @@ lando start
Verification commands
---------------------

# Should be able to connect to all mariadb relationships
lando mariadb main -e "show tables;"
# Should be able to connect to all mysql relationships
lando mysql acquia -e "show tables;"

Destroy tests
-------------
Expand All @@ -122,7 +122,7 @@ Before running all or some of the tests you will need to generate them.
npm run test:leia

# Run the tests for a single example
npx leia examples/mariadb-10.2/README.md -c 'Destroy tests'
npx leia examples/acquia-default/README.md -c 'Destroy tests'
```

If you've created new testable examples then you will also need to let GitHub Actions know so they can run on pull requests.
Expand Down
22 changes: 1 addition & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
},
"dependencies": {
"@lando/mailhog": "^1.0.0",
"@lando/mariadb": "^1.3.0",
"@lando/memcached": "^1.1.0",
"@lando/mysql": "^1.1.0",
"@lando/nginx": "^1.0.0",
Expand Down
Loading