diff --git a/.circleci/config.yml b/.circleci/config.yml index fe86e6a..e1c62ea 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,8 +3,7 @@ references: - container_config_node: - &container_config_node + container_config_node: &container_config_node working_directory: ~/project/build docker: - image: cimg/node:<< parameters.node-version >>-browsers @@ -15,47 +14,39 @@ references: workspace_root: &workspace_root ~/project - attach_workspace: - &attach_workspace + attach_workspace: &attach_workspace attach_workspace: at: *workspace_root - npm_cache_keys: - &npm_cache_keys + npm_cache_keys: &npm_cache_keys keys: - v6-dependency-npm-{{ checksum "package.json" }}- - v6-dependency-npm-{{ checksum "package.json" }} - v6-dependency-npm- - cache_npm_cache: - &cache_npm_cache + cache_npm_cache: &cache_npm_cache save_cache: key: v3-dependency-npm-{{ checksum "package.json" }}-{{ epoch }} paths: - ./node_modules/ - restore_npm_cache: - &restore_npm_cache + restore_npm_cache: &restore_npm_cache restore_cache: <<: *npm_cache_keys - filters_only_main: - &filters_only_main + filters_only_main: &filters_only_main branches: only: main - filters_ignore_main: - &filters_ignore_main + filters_ignore_main: &filters_ignore_main branches: ignore: main - filters_ignore_tags: - &filters_ignore_tags + filters_ignore_tags: &filters_ignore_tags tags: ignore: /.*/ - filters_version_tag: - &filters_version_tag + filters_version_tag: &filters_version_tag tags: only: - /^v?\d+\.\d+\.\d+(?:-beta\.\d+)?$/ @@ -76,11 +67,9 @@ jobs: - run: name: Checkout next-ci-shared-helpers command: git clone --depth 1 - git@github.com:Financial-Times/next-ci-shared-helpers.git - .circleci/shared-helpers + git@github.com:Financial-Times/next-ci-shared-helpers.git --branch + unpin-heroku .circleci/shared-helpers - *restore_npm_cache - - node/install-npm: - version: "7.20.2" - run: name: Install project dependencies command: make install @@ -143,14 +132,14 @@ workflows: name: build-v<< matrix.node-version >> matrix: parameters: - node-version: [ "16.14", "18.16" ] + node-version: [ "16.20", "18.16" ] - test: requires: - build-v<< matrix.node-version >> name: test-v<< matrix.node-version >> matrix: parameters: - node-version: [ "16.14", "18.16" ] + node-version: [ "16.20", "18.16" ] build-test-publish: when: @@ -165,7 +154,7 @@ workflows: name: build-v<< matrix.node-version >> matrix: parameters: - node-version: [ "16.14", "18.16" ] + node-version: [ "16.20", "18.16" ] - test: filters: <<: *filters_version_tag @@ -174,13 +163,13 @@ workflows: name: test-v<< matrix.node-version >> matrix: parameters: - node-version: [ "16.14", "18.16" ] + node-version: [ "16.20", "18.16" ] - publish: context: npm-publish-token filters: <<: *filters_version_tag requires: - - test-v16.14 + - test-v18.16 nightly: when: @@ -197,7 +186,7 @@ workflows: name: build-v<< matrix.node-version >> matrix: parameters: - node-version: [ "16.14", "18.16" ] + node-version: [ "16.20", "18.16" ] - test: requires: - build-v<< matrix.node-version >> @@ -205,4 +194,4 @@ workflows: name: test-v<< matrix.node-version >> matrix: parameters: - node-version: [ "16.14", "18.16" ] + node-version: [ "16.20", "18.16" ] diff --git a/package-lock.json b/package-lock.json index d170126..2da81e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,6 @@ "": { "name": "@financial-times/n-test", "version": "0.0.0", - "hasInstallScript": true, "license": "ISC", "dependencies": { "chalk": "^2.3.0", diff --git a/package.json b/package.json index e0fb917..6990f2b 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,7 @@ }, "scripts": { "test": "make test", - "prepare": "npx snyk protect || npx snyk protect -d || true", - "preinstall": "[ \"$INIT_CWD\" != \"$PWD\" ] || npm_config_yes=true npx check-engine" + "prepare": "npx snyk protect || npx snyk protect -d || true" }, "repository": { "type": "git",