From 7ea521665c66e200fa547747beb5d6bfe3b0356d Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Wed, 31 Aug 2022 18:52:16 +1200 Subject: [PATCH] Revert "Allow CI to use a custom env" This reverts commit d1b5c69ba14ac76313b37f43f2be406839482949. # Conflicts: # .env.test --- .env.test | 89 ------------------------------------- .github/workflows/tests.yml | 2 +- 2 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 .env.test diff --git a/.env.test b/.env.test deleted file mode 100644 index 2bf3931329..0000000000 --- a/.env.test +++ /dev/null @@ -1,89 +0,0 @@ -_APP_ENV=development -_APP_LOCALE=en -_APP_WORKER_PER_CORE=6 -_APP_CONSOLE_WHITELIST_ROOT=disabled -_APP_CONSOLE_WHITELIST_EMAILS= -_APP_CONSOLE_WHITELIST_IPS= -_APP_SYSTEM_EMAIL_NAME=Appwrite -_APP_SYSTEM_EMAIL_ADDRESS=team@appwrite.io -_APP_SYSTEM_SECURITY_EMAIL_ADDRESS=security@appwrite.io -_APP_SYSTEM_RESPONSE_FORMAT= -# Enabled for tests -_APP_OPTIONS_ABUSE=disabled -_APP_OPTIONS_FORCE_HTTPS=disabled -_APP_OPENSSL_KEY_V1=your-secret-key -_APP_DOMAIN=demo.appwrite.io -_APP_DOMAIN_TARGET=demo.appwrite.io -_APP_REDIS_HOST=redis -_APP_REDIS_PORT=6379 -_APP_REDIS_PASS= -_APP_REDIS_USER= -_APP_DB_HOST=mariadb -_APP_DB_PORT=3306 -_APP_DB_SCHEMA=appwrite -_APP_DB_USER=user -_APP_DB_PASS=password -_APP_DB_ROOT_PASS=rootsecretpassword -_APP_STORAGE_DEVICE=Local -_APP_STORAGE_S3_ACCESS_KEY= -_APP_STORAGE_S3_SECRET= -_APP_STORAGE_S3_REGION=us-east-1 -_APP_STORAGE_S3_BUCKET= -_APP_STORAGE_DO_SPACES_ACCESS_KEY= -_APP_STORAGE_DO_SPACES_SECRET= -_APP_STORAGE_DO_SPACES_REGION=us-east-1 -_APP_STORAGE_DO_SPACES_BUCKET= -_APP_STORAGE_BACKBLAZE_ACCESS_KEY= -_APP_STORAGE_BACKBLAZE_SECRET= -_APP_STORAGE_BACKBLAZE_REGION=us-west-004 -_APP_STORAGE_BACKBLAZE_BUCKET= -_APP_STORAGE_LINODE_ACCESS_KEY= -_APP_STORAGE_LINODE_SECRET= -_APP_STORAGE_LINODE_REGION=eu-central-1 -_APP_STORAGE_LINODE_BUCKET= -_APP_STORAGE_WASABI_ACCESS_KEY= -_APP_STORAGE_WASABI_SECRET= -_APP_STORAGE_WASABI_REGION=eu-central-1 -_APP_STORAGE_WASABI_BUCKET= -_APP_STORAGE_ANTIVIRUS=disabled -_APP_STORAGE_ANTIVIRUS_HOST=clamav -_APP_STORAGE_ANTIVIRUS_PORT=3310 -_APP_INFLUXDB_HOST=influxdb -_APP_INFLUXDB_PORT=8086 -_APP_STATSD_HOST=telegraf -_APP_STATSD_PORT=8125 -_APP_SMTP_HOST=maildev -_APP_SMTP_PORT=1025 -_APP_SMTP_SECURE= -_APP_SMTP_USERNAME= -_APP_SMTP_PASSWORD= -_APP_SMS_PROVIDER=sms://mock -_APP_SMS_FROM=+123456789 -_APP_STORAGE_LIMIT=30000000 -_APP_STORAGE_PREVIEW_LIMIT=20000000 -_APP_FUNCTIONS_SIZE_LIMIT=30000000 -_APP_FUNCTIONS_TIMEOUT=900 -_APP_FUNCTIONS_BUILD_TIMEOUT=900 -_APP_FUNCTIONS_CONTAINERS=10 -_APP_FUNCTIONS_CPUS=0 -_APP_FUNCTIONS_MEMORY=0 -_APP_FUNCTIONS_MEMORY_SWAP=0 -_APP_FUNCTIONS_INACTIVE_THRESHOLD=60 -# Set for tests -_APP_FUNCTIONS_RUNTIMES=php-8.0 -OPEN_RUNTIMES_NETWORK=appwrite_runtimes -_APP_EXECUTOR_SECRET=your-secret-key -_APP_EXECUTOR_HOST=http://appwrite-executor/v1 -_APP_MAINTENANCE_INTERVAL=86400 -_APP_MAINTENANCE_RETENTION_CACHE=2592000 -_APP_MAINTENANCE_RETENTION_EXECUTION=1209600 -_APP_MAINTENANCE_RETENTION_ABUSE=86400 -_APP_MAINTENANCE_RETENTION_AUDIT=1209600 -_APP_USAGE_TIMESERIES_INTERVAL=2 -_APP_USAGE_DATABASE_INTERVAL=15 -_APP_USAGE_STATS=enabled -_APP_LOGGING_PROVIDER= -_APP_LOGGING_CONFIG= -DOCKERHUB_PULL_USERNAME= -DOCKERHUB_PULL_PASSWORD= -DOCKERHUB_PULL_EMAIL= \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4ad1e83ca4..2ed2b65ff7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,7 +23,7 @@ jobs: # Upstream bug causes buildkit pulls to fail so prefetch base images # https://github.com/moby/moby/issues/41864 run: | - cp .env.test .env + echo "_APP_FUNCTIONS_RUNTIMES=php-8.0" >> .env docker pull composer:2.0 docker pull php:8.0-cli-alpine docker compose build --progress=plain