Skip to content

Commit

Permalink
All installed files must contain #ddev-generated (#5)
Browse files Browse the repository at this point in the history
Signed-off-by: Randy Fay <[email protected]>
  • Loading branch information
rfay committed Jun 16, 2022
1 parent 0079632 commit 9422e9e
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: tests
on:
pull_request:
push:
branches: [ master, main ]
branches: [ main ]

schedule:
- cron: '01 07 * * *'
Expand All @@ -29,7 +29,7 @@ jobs:

strategy:
matrix:
ddev_version: [stable, edge, HEAD]
ddev_version: [stable, HEAD]
# ddev_version: [PR]
fail-fast: false

Expand Down
2 changes: 1 addition & 1 deletion commands/redis/redis-cli
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
1 change: 1 addition & 0 deletions docker-compose.redis.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#ddev-generated
version: '3.6'
services:
redis:
Expand Down
6 changes: 4 additions & 2 deletions install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion redis/redis.conf
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion redis/scripts/settings.ddev.redis.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php

// #ddev-generated
use Drupal\Core\Installer\InstallerKernel;

if (!InstallerKernel::installationAttempted() && extension_loaded('redis') && class_exists('Drupal\redis\ClientFactory')) {
Expand Down
2 changes: 1 addition & 1 deletion redis/scripts/setup-drupal-settings.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash

#ddev-generated
set -e

if [[ $DDEV_PROJECT_TYPE != drupal* ]] || [[ $DDEV_PROJECT_TYPE =~ ^drupal(6|7)$ ]] ;
Expand Down

0 comments on commit 9422e9e

Please sign in to comment.