diff --git a/.circleci/config.yml b/.circleci/config.yml index 7cd72c9b..cb865017 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -69,7 +69,8 @@ jobs: sudo pip install awscli sudo apt-get update sudo apt-get install lftp - if [ "$CIRCLE_BRANCH" = "master" ]; then make deploy-staging-files; fi + if [ "$CIRCLE_BRANCH" = "master" ]; then make deploy-staging-files; fi + if [ "$CIRCLE_BRANCH" = "master" ]; then make deploy-staging-population; fi workflows: install: diff --git a/Makefile b/Makefile index 475a1038..07f68617 100644 --- a/Makefile +++ b/Makefile @@ -23,3 +23,8 @@ deploy-instance-files: s3upload: aws s3 cp ${FILE} s3://$(BUCKET)/ --cache-control max-age=0 + +deploy-staging-population: + curl -u ${CIRCLE_API_USER_TOKEN}: \ + -d 'build_parameters[CIRCLE_JOB]=deploy_dev1' \ + https://circleci.com/api/v1.1/project/github/opensupports/staging-population/tree/master diff --git a/server/composer.json b/server/composer.json index 3866abae..72ddbeb1 100755 --- a/server/composer.json +++ b/server/composer.json @@ -1,10 +1,10 @@ { "config": { "platform": { - "php": "7.1", + "php": "5.6", "ext-fileinfo": "1.0.5" } - }, + }, "require": { "slim/slim": "~2.0", "respect/validation": "^1.1", diff --git a/server/files/.htaccess b/server/files/.htaccess old mode 100644 new mode 100755