Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Toolkit migration to v4.x.x #529

Merged
merged 1 commit into from
Jan 24, 2025
Merged

chore: Toolkit migration to v4.x.x #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 30 additions & 66 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2.1
orbs:
tool-kit: financial-times/dotcom-tool-kit@4
tool-kit: financial-times/dotcom-tool-kit@5
executors:
node:
docker:
Expand All @@ -11,8 +11,10 @@ jobs:
- image: cimg/base:stable
steps:
- checkout
- tool-kit/persist-workspace:
path: .
- persist_to_workspace:
root: .
paths:
- .
envTest:
executor: tool-kit/default
steps:
Expand All @@ -30,96 +32,71 @@ workflows:
- checkout:
filters:
tags:
only: /^v\d+\.\d+\.\d+(-.+)?/
- waiting-for-approval:
type: approval
filters:
branches:
only: /(^renovate-.*|^nori/.*)/
only: /^v\d+\.\d+\.\d+(-.+)?/
- tool-kit/setup:
name: tool-kit/setup-<< matrix.executor >>
executor: node
requires:
- checkout
- waiting-for-approval
matrix:
parameters:
executor:
- node
filters:
tags:
only: /^v\d+\.\d+\.\d+(-.+)?/
- envTest:
requires:
- checkout
- waiting-for-approval
- tool-kit/setup
- tool-kit/build:
name: tool-kit/build-<< matrix.executor >>
executor: node
requires:
- envTest
- tool-kit/setup-<< matrix.executor >>
matrix:
parameters:
executor:
- node
- tool-kit/setup
filters:
tags:
only: /^v\d+\.\d+\.\d+(-.+)?/
- tool-kit/test:
name: tool-kit/test-<< matrix.executor >>
executor: node
requires:
- tool-kit/build-<< matrix.executor >>
matrix:
parameters:
executor:
- node
- tool-kit/build
filters:
tags:
only: /^v\d+\.\d+\.\d+(-.+)?/
- tool-kit/deploy-review:
requires:
- tool-kit/setup-node
- waiting-for-approval
name: tool-kit/deploy-review-node
executor: node
requires:
- tool-kit/setup
filters:
tags:
only: /^v\d+\.\d+\.\d+(-.+)?/
branches:
ignore: main
- tool-kit/deploy-staging:
requires:
- tool-kit/setup-node
name: tool-kit/deploy-staging-node
executor: node
requires:
- tool-kit/setup
filters:
tags:
only: /^v\d+\.\d+\.\d+(-.+)?/
branches:
only: main
- tool-kit/e2e-test-review:
requires:
- tool-kit/deploy-review-node
name: tool-kit/e2e-test-review-node
executor: node
requires:
- tool-kit/deploy-review
filters:
tags:
only: /^v\d+\.\d+\.\d+(-.+)?/
- tool-kit/e2e-test-staging:
requires:
- tool-kit/deploy-staging-node
name: tool-kit/e2e-test-staging-node
executor: node
requires:
- tool-kit/deploy-staging
filters:
tags:
only: /^v\d+\.\d+\.\d+(-.+)?/
- tool-kit/deploy-production:
executor: node
requires:
- envTest
- tool-kit/e2e-test-staging-node
- tool-kit/test-node
name: tool-kit/deploy-production-node
executor: node
- tool-kit/test
- tool-kit/e2e-test-staging
filters:
tags:
only: /^v\d+\.\d+\.\d+(-.+)?/
Expand All @@ -137,34 +114,21 @@ workflows:
jobs:
- checkout
- tool-kit/setup:
name: tool-kit/setup-<< matrix.executor >>
executor: node
requires:
- checkout
matrix:
parameters:
executor:
- node
- tool-kit/build:
name: tool-kit/build-<< matrix.executor >>
executor: node
requires:
- tool-kit/setup-<< matrix.executor >>
matrix:
parameters:
executor:
- node
- tool-kit/setup
- tool-kit/test:
name: tool-kit/test-<< matrix.executor >>
executor: node
requires:
- tool-kit/build-<< matrix.executor >>
matrix:
parameters:
executor:
- node
- tool-kit/build
- tool-kit/deploy-review:
requires:
- tool-kit/setup-node
name: tool-kit/deploy-review-node
executor: node
requires:
- tool-kit/setup
filters:
branches:
ignore: main
ignore: main
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ tmp/*
health/history/

next-syndication-api-*.json
.toolkitstate
35 changes: 21 additions & 14 deletions .toolkitrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins:
- "./toolkit/logs"
- "@dotcom-tool-kit/backend-heroku-app"

hooks:
commands:
test:local:
- Mocha

Expand All @@ -19,16 +19,23 @@ hooks:
- SyndicationAPILogs

options:
"@dotcom-tool-kit/mocha": {}
"@dotcom-tool-kit/eslint": {}
"@dotcom-tool-kit/circleci": { nodeVersion: 22.12-browsers }
"@dotcom-tool-kit/heroku":
pipeline: ft-next-syndication-api
systemCode: next-syndication-api
scaling:
ft-next-syndication-api:
web:
size: standard-1X
quantity: 1
"@dotcom-tool-kit/doppler":
project: next-syndication-api
tasks:
Eslint:
files:
- "**/*.{js,jsx}"
Mocha:
configPath: "./.mocharc.json"
HerokuProduction:
scaling:
ft-next-syndication-api:
web:
size: standard-1X
quantity: 1
plugins:
"@dotcom-tool-kit/circleci":
cimgNodeVersions: [22.12-browsers]
"@dotcom-tool-kit/heroku":
pipeline: "ft-next-syndication-api"
systemCode: "next-syndication-api"
"@dotcom-tool-kit/doppler":
project: next-syndication-api
Loading