From 99e69e0c2fe2767f2d313c5f958b5fc808f787be Mon Sep 17 00:00:00 2001 From: circle-auto-deploy Date: Fri, 29 Jan 2021 12:57:42 +0000 Subject: [PATCH 1/2] master to main branch changes --- .circleci/config.yml | 6 +++--- lib/host.js | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d645242f..9350a455 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,9 +31,9 @@ references: restore_cache: <<: *npm_cache_keys - filters_only_master: &filters_only_master + filters_only_main: &filters_only_main branches: - only: master + only: main filters_ignore_tags: &filters_ignore_tags tags: @@ -165,7 +165,7 @@ workflows: - schedule: cron: "0 0 * * *" filters: - <<: *filters_only_master + <<: *filters_only_main jobs: - build: context: next-nightly-build diff --git a/lib/host.js b/lib/host.js index 3ba39ba6..5bb01634 100644 --- a/lib/host.js +++ b/lib/host.js @@ -8,12 +8,6 @@ module.exports = { 'test'; }, - isMasterBranch: () => { - return process.env.CIRCLE_BRANCH === 'master' || - process.env.GIT_BRANCH === 'master' || - (!process.env.TRAVIS_PULL_REQUEST && process.env.TRAVIS_BRANCH === 'master'); - }, - url: (appName) => { let host = appName || 'http://local.ft.com:3002'; if (!/:|\./.test(host)) { From 7bf93f2edecde3a96b68c85f0239e41738a2d86a Mon Sep 17 00:00:00 2001 From: circle-auto-deploy Date: Fri, 29 Jan 2021 12:58:13 +0000 Subject: [PATCH 2/2] added DEPRECATED note for nht rebuild on README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2fdff8cd..80e52088 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ Commands: configure [options] [source] [target] gets environment variables from Vault and uploads them to the current app deploy-static [options] [otherSources...] Deploys static to S3. Requires AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY env vars run [options] Runs the local app through the router - rebuild [options] [apps...] Trigger a rebuild of the latest master on Circle + rebuild [options] [apps...] DEPRECATED. Trigger a rebuild of the latest master on Circle gtg [app] Runs gtg checks for an app review-app [options] [appName] Create or find an existing heroku review app and print out the app name. [appName] is the package.json name (which is also the value of VAULT_NAME). On the first build of a branch, Heroku will create a review app with a build. On subsequent builds, Heroku will automatically generate a new build, which this task looks for. See https://devcenter.heroku.com/articles/review-apps-beta for more details of the internals upload-assets-to-s3 [options] Uploads a folder of assets to an S3 bucket