diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d072eb2..9231cdc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,7 +2,7 @@ name: tests on: pull_request: push: - branches: [ master, main ] + branches: [ main ] schedule: - cron: '01 07 * * *' @@ -29,7 +29,7 @@ jobs: strategy: matrix: - ddev_version: [stable, edge, HEAD] + ddev_version: [stable, HEAD] # ddev_version: [PR] fail-fast: false diff --git a/commands/redis/redis-cli b/commands/redis/redis-cli index de20ce0..27bf575 100755 --- a/commands/redis/redis-cli +++ b/commands/redis/redis-cli @@ -1,5 +1,5 @@ #!/bin/bash - +#ddev-generated ## Description: Run redis-cli inside the redis container ## Usage: redis-cli [flags] [args] ## Example: "redis-cli KEYS *" or "ddev redis-cli INFO" or "ddev redis-cli --version" diff --git a/docker-compose.redis.yaml b/docker-compose.redis.yaml index 61fefdf..fab0503 100644 --- a/docker-compose.redis.yaml +++ b/docker-compose.redis.yaml @@ -1,3 +1,4 @@ +#ddev-generated version: '3.6' services: redis: diff --git a/install.yaml b/install.yaml index 5ac2e01..783f5a5 100644 --- a/install.yaml +++ b/install.yaml @@ -8,8 +8,10 @@ pre_install_actions: # list of files and directories listed that are copied into project .ddev directory project_files: - docker-compose.redis.yaml -- redis/ -- commands/redis/ +- redis/scripts/settings.ddev.redis.php +- redis/scripts/setup-drupal-settings.sh +- redis/redis.conf +- commands/redis/redis-cli # List of files and directories that are copied into the global .ddev directory global_files: diff --git a/redis/redis.conf b/redis/redis.conf index a6529c7..0b5216e 100644 --- a/redis/redis.conf +++ b/redis/redis.conf @@ -1,5 +1,5 @@ # Redis configuration. -# +# #ddev-generated # Example configuration files for reference: # http://download.redis.io/redis-stable/redis.conf # http://download.redis.io/redis-stable/sentinel.conf diff --git a/redis/scripts/settings.ddev.redis.php b/redis/scripts/settings.ddev.redis.php index d54e897..a834a05 100644 --- a/redis/scripts/settings.ddev.redis.php +++ b/redis/scripts/settings.ddev.redis.php @@ -1,5 +1,5 @@