From 01415a739040225d1ce723a4b48a0307d5c9e349 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Mon, 29 Jan 2024 13:33:24 +1300 Subject: [PATCH] FIX Fix indentation of EOF (#99) EOF has to have no indentation, even inside nested control structures. --- .github/workflows/ci.yml | 108 +++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4b2660..3b2f1f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -680,61 +680,61 @@ jobs: if [[ "${{ matrix.db }}" =~ mysql ]]; then if [[ "${{ matrix.db }}" == "mysql57pdo" ]]; then cat << EOF > .env - SS_DATABASE_CLASS="MySQLPDODatabase" - SS_DATABASE_PORT="3357" - EOF + SS_DATABASE_CLASS="MySQLPDODatabase" + SS_DATABASE_PORT="3357" + EOF else cat << EOF > .env - SS_DATABASE_CLASS="MySQLDatabase" - SS_DATABASE_PORT="${{ matrix.db == 'mysql57' && '3357' || '3380' }}" - EOF + SS_DATABASE_CLASS="MySQLDatabase" + SS_DATABASE_PORT="${{ matrix.db == 'mysql57' && '3357' || '3380' }}" + EOF fi cat << EOF >> .env - SS_DATABASE_SERVER="127.0.0.1" - SS_DATABASE_USERNAME="root" - SS_DATABASE_PASSWORD="root" - EOF + SS_DATABASE_SERVER="127.0.0.1" + SS_DATABASE_USERNAME="root" + SS_DATABASE_PASSWORD="root" + EOF elif [[ "${{ matrix.db }}" =~ pgsql ]]; then cat << EOF > .env - SS_DATABASE_CLASS="PostgreSQLDatabase" - SS_DATABASE_SERVER="localhost" - SS_DATABASE_PORT="5432" - SS_DATABASE_USERNAME="postgres" - SS_DATABASE_PASSWORD="postgres" - EOF + SS_DATABASE_CLASS="PostgreSQLDatabase" + SS_DATABASE_SERVER="localhost" + SS_DATABASE_PORT="5432" + SS_DATABASE_USERNAME="postgres" + SS_DATABASE_PASSWORD="postgres" + EOF elif [[ "${{ matrix.db }}" =~ sqlite3 ]]; then cat << EOF > .env - SS_DATABASE_CLASS="SQLite3Database" - SS_DATABASE_USERNAME="root" - SS_DATABASE_PASSWORD="" - SS_SQLITE_DATABASE_PATH=":memory:" - EOF + SS_DATABASE_CLASS="SQLite3Database" + SS_DATABASE_USERNAME="root" + SS_DATABASE_PASSWORD="" + SS_SQLITE_DATABASE_PATH=":memory:" + EOF elif [[ "${{ matrix.db }}" =~ mariadb ]]; then cat << EOF > .env - SS_DATABASE_SERVER="127.0.0.1" - SS_DATABASE_PORT="3311" - SS_DATABASE_USERNAME="root" - SS_DATABASE_PASSWORD="root" - EOF + SS_DATABASE_SERVER="127.0.0.1" + SS_DATABASE_PORT="3311" + SS_DATABASE_USERNAME="root" + SS_DATABASE_PASSWORD="root" + EOF fi cat << EOF >> .env - SS_ENVIRONMENT_TYPE="dev" - SS_DATABASE_NAME="SS_mysite" - SS_DEFAULT_ADMIN_USERNAME="admin" - SS_DEFAULT_ADMIN_PASSWORD="password" - SS_TRUSTED_PROXY_IPS="*" - SS_MFA_SECRET_KEY="1234567894175b99966561e1efe237e4" - SS_BASE_URL="http://localhost" - EOF + SS_ENVIRONMENT_TYPE="dev" + SS_DATABASE_NAME="SS_mysite" + SS_DEFAULT_ADMIN_USERNAME="admin" + SS_DEFAULT_ADMIN_PASSWORD="password" + SS_TRUSTED_PROXY_IPS="*" + SS_MFA_SECRET_KEY="1234567894175b99966561e1efe237e4" + SS_BASE_URL="http://localhost" + EOF if [[ $GITHUB_REPOSITORY =~ /(silverstripe-dynamodb)$ ]]; then cat << EOF >> .env - AWS_DYNAMODB_ENDPOINT="http://localhost:8000" - AWS_DYNAMODB_SESSION_TABLE=mysession - AWS_ACCESS_KEY=myaccesskey - AWS_SECRET_KEY=mysecret - AWS_REGION_NAME=ap-southeast-2 - EOF + AWS_DYNAMODB_ENDPOINT="http://localhost:8000" + AWS_DYNAMODB_SESSION_TABLE=mysession + AWS_ACCESS_KEY=myaccesskey + AWS_SECRET_KEY=mysecret + AWS_REGION_NAME=ap-southeast-2 + EOF fi # debug @@ -744,20 +744,20 @@ jobs: # silverstripe logging if [[ -d "./app/_config/" ]]; then cat << EOF >> app/_config/my-logger.yml - --- - Name: error-logging - After: '*' - --- - SilverStripe\Core\Injector\Injector: - Psr\Log\LoggerInterface.errorhandler: - calls: - LogFileHandler: [ pushHandler, [ '%\$LogFileHandler' ] ] - LogFileHandler: - class: Monolog\Handler\StreamHandler - constructor: - - "$GITHUB_WORKSPACE/silverstripe.log" - - "debug" - EOF + --- + Name: error-logging + After: '*' + --- + SilverStripe\Core\Injector\Injector: + Psr\Log\LoggerInterface.errorhandler: + calls: + LogFileHandler: [ pushHandler, [ '%\$LogFileHandler' ] ] + LogFileHandler: + class: Monolog\Handler\StreamHandler + constructor: + - "$GITHUB_WORKSPACE/silverstripe.log" + - "debug" + EOF fi # run dev/build flush to help debug any issues (though it's not strictly required here)