Skip to content

Commit

Permalink
Merge pull request #12 from Financial-Times/NOPS-943-rename-head-bran…
Browse files Browse the repository at this point in the history
…ch-to-main

Nops 943 rename head branch to main
  • Loading branch information
jenniferemshepherd authored Aug 12, 2021
2 parents e482969 + 9f07822 commit 1c72bb8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ 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_master: &filters_ignore_master
filters_ignore_main: &filters_ignore_main
branches:
ignore: master
ignore: main

filters_ignore_tags: &filters_ignore_tags
tags:
Expand Down Expand Up @@ -148,7 +148,7 @@ workflows:
- schedule:
cron: "0 0 * * *"
filters:
<<: *filters_only_master
<<: *filters_only_main
jobs:
- build:
context: next-nightly-build
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"homepage": "https://github.com/Financial-Times/n-map-content-to-topper#readme",
"devDependencies": {
"@financial-times/n-gage": "^6.0.1",
"@financial-times/n-gage": "^8.2.0",
"bower": "^1.8.8",
"chai": "^4.2.0",
"mocha": "^8.1.1",
Expand Down

0 comments on commit 1c72bb8

Please sign in to comment.