From 3c37369514a8904e46812b11d3b81664fd38c9ef Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Wed, 20 Sep 2023 09:04:05 -0400 Subject: [PATCH 1/2] build: switched CircleCI config to GHA test.yml --- .circleci/config.yml | 66 -------------------------------------- .github/workflows/test.yml | 18 +++++++++++ 2 files changed, 18 insertions(+), 66 deletions(-) delete mode 100644 .circleci/config.yml create mode 100644 .github/workflows/test.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 78d8b25b..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,66 +0,0 @@ -version: 2 - -# This key means nothing to CircleCI; it's just a place to keep anchored -# configuration nodes for reuse. -common_settings: - working_directory: &workdir ~/project - cache_key: &cachekey 'v1-npm-cache-{{ .Branch }}' - docker: &docker_setup - - image: 'circleci/node:8.11.2' - - install_latest_npm: &install_latest_npm - name: Ensure NPM is up to date - command: sudo npm install -g npm@latest -jobs: - test: - docker: *docker_setup - working_directory: *workdir - steps: - - checkout - - restore_cache: - keys: - - *cachekey - - v1-npm-cache- - - run: *install_latest_npm - - run: npm ci - - run: npm test - - save_cache: - paths: - - ~/.ssh - - ~/.npm - - /root/.npm - key: *cachekey - - persist_to_workspace: - root: *workdir - paths: - - . - deploy: - docker: *docker_setup - working_directory: *workdir - steps: - - attach_workspace: - at: *workdir - - run: *install_latest_npm - - run: - name: Authenticate with registry - command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > .npmrc - - run: - name: Publish package - command: npm publish --access=public - -workflows: - version: 2 - test-and-deploy: - jobs: - - test: - filters: - tags: - only: /.*/ - - deploy: - requires: - - test - filters: - tags: - only: /^v.*/ - branches: - ignore: /.*/ diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 00000000..64a220b1 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,18 @@ +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 + with: + node-version: 18 + - run: npm ci + - run: npm run test + +name: Test + +on: + pull_request: ~ + push: + branches: + - main From a6b68f426ff77f543dd682e9d2b1abf80054f383 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Wed, 20 Sep 2023 09:06:41 -0400 Subject: [PATCH 2/2] Refreshed package-lock.json --- package-lock.json | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index e7224153..fcfbc2df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,9 +7,9 @@ "": { "name": "eslint-plugin-package-json", "version": "0.1.5", - "license": "(OSL-3.0 OR AFL-3.0)", + "license": "MIT", "dependencies": { - "disparity": "^3.0.0", + "disparity": "^3.2.0", "package-json-validator": "^0.6.3", "requireindex": "^1.2.0" }, @@ -193,11 +193,6 @@ "to-fast-properties": "^2.0.0" } }, - "node_modules/@types/color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" - }, "node_modules/acorn": { "version": "6.4.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", @@ -626,12 +621,12 @@ } }, "node_modules/disparity": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/disparity/-/disparity-3.0.0.tgz", - "integrity": "sha512-n94Rzbv2ambRaFzrnBf34IEiyOdIci7maRpMkoQWB6xFYGA7Nbs0Z5YQzMfTeyQeelv23nayqOcssBoc6rKrgw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/disparity/-/disparity-3.2.0.tgz", + "integrity": "sha512-8cl9ouncFYE7OQsYwJNiy2e15S0xN80X1Jj/N/YkoiM+VGWSyg1YzPToecKyYx2DQiJapt5IC8yi43GW23TUHQ==", "dependencies": { - "ansi-styles": "^4.1.0", - "diff": "^4.0.1" + "ansi-styles": "^4.2.1", + "diff": "^4.0.2" }, "bin": { "disparity": "bin/disparity" @@ -641,15 +636,17 @@ } }, "node_modules/disparity/node_modules/ansi-styles": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.0.tgz", - "integrity": "sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dependencies": { - "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, "node_modules/disparity/node_modules/color-convert": { @@ -669,9 +666,9 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/disparity/node_modules/diff": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz", - "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "engines": { "node": ">=0.3.1" }