From dcb71a9d91b7349ac1258f5214b6c018c692a546 Mon Sep 17 00:00:00 2001 From: riddhi-desai Date: Mon, 11 Nov 2024 10:38:43 -0500 Subject: [PATCH 1/4] MAT-7896 update github actions to v4 --- .github/workflows/unit_test_coverage.yml | 16 ++++++++-------- package-lock.json | 5 +++++ package.json | 1 + 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/unit_test_coverage.yml b/.github/workflows/unit_test_coverage.yml index badd040..a41e69b 100644 --- a/.github/workflows/unit_test_coverage.yml +++ b/.github/workflows/unit_test_coverage.yml @@ -25,15 +25,15 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Use Node.js (matrix) - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.version }} - name: Cache node modules - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-node-modules with: @@ -63,7 +63,7 @@ jobs: run: npm run-script coverage - name: Store the coverage report as an artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: coverage path: src/coverage/lcov.info @@ -74,7 +74,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download coverage artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: coverage @@ -90,13 +90,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download coverage artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: coverage - name: Upload code coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: file: lcov.info fail_ci_if_error: true diff --git a/package-lock.json b/package-lock.json index 29bc106..204e237 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,7 @@ "name": "@madie/madie-util", "dependencies": { "@madie/madie-models": "^1.3.11", + "@madie/madie-util": "file:", "axios": "^1.6.7", "dompurify": "^3.1.5", "react": "^17.0.2", @@ -2890,6 +2891,10 @@ "integrity": "sha512-1zFjj8CwB4UC7ai0wIewzJ/MLVR/5V+IhSB1K8H1HXB2AIRYlm21/0LyeQ9N+H906Z8Z5LmtRR+8y6I6nAwuoQ==", "license": "ISC" }, + "node_modules/@madie/madie-util": { + "resolved": "", + "link": true + }, "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { "version": "5.1.1-v1", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", diff --git a/package.json b/package.json index 752fb32..62f9b7d 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ }, "dependencies": { "@madie/madie-models": "^1.3.11", + "@madie/madie-util": "file:", "axios": "^1.6.7", "dompurify": "^3.1.5", "react": "^17.0.2", From 2709d9c91c54b0178a543c9a9d9799099400aef5 Mon Sep 17 00:00:00 2001 From: riddhi-desai Date: Mon, 11 Nov 2024 14:26:58 -0500 Subject: [PATCH 2/4] update github actions to v4 --- .github/workflows/npm-publish.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index 388d896..e544ace 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -10,15 +10,15 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Use Node.js 20.x - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20.x - name: Cache node modules - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-node-modules with: From 670a889e28fbe7645acd052f2b0841f2550fc2c3 Mon Sep 17 00:00:00 2001 From: riddhi-desai <121314059+riddhi-desai@users.noreply.github.com> Date: Thu, 5 Dec 2024 09:44:37 -0500 Subject: [PATCH 3/4] Update unit_test_coverage.yml --- .github/workflows/unit_test_coverage.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unit_test_coverage.yml b/.github/workflows/unit_test_coverage.yml index a41e69b..0bf4806 100644 --- a/.github/workflows/unit_test_coverage.yml +++ b/.github/workflows/unit_test_coverage.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - version: [20, 21, 18] + version: [20, 22, 18] name: Checkout, install, lint, build and test with coverage runs-on: ubuntu-latest @@ -67,6 +67,7 @@ jobs: with: name: coverage path: src/coverage/lcov.info + overwrite: true upload-codacy-coverage: name: Upload code coverage to Codacy From 6d3b0c0631a8096fd54653c2a336db57bfaf6b89 Mon Sep 17 00:00:00 2001 From: riddhi-desai <121314059+riddhi-desai@users.noreply.github.com> Date: Thu, 5 Dec 2024 15:56:10 +0000 Subject: [PATCH 4/4] Remove self dependency file --- package-lock.json | 5 ----- package.json | 1 - 2 files changed, 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 204e237..29bc106 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,6 @@ "name": "@madie/madie-util", "dependencies": { "@madie/madie-models": "^1.3.11", - "@madie/madie-util": "file:", "axios": "^1.6.7", "dompurify": "^3.1.5", "react": "^17.0.2", @@ -2891,10 +2890,6 @@ "integrity": "sha512-1zFjj8CwB4UC7ai0wIewzJ/MLVR/5V+IhSB1K8H1HXB2AIRYlm21/0LyeQ9N+H906Z8Z5LmtRR+8y6I6nAwuoQ==", "license": "ISC" }, - "node_modules/@madie/madie-util": { - "resolved": "", - "link": true - }, "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { "version": "5.1.1-v1", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", diff --git a/package.json b/package.json index 62f9b7d..752fb32 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,6 @@ }, "dependencies": { "@madie/madie-models": "^1.3.11", - "@madie/madie-util": "file:", "axios": "^1.6.7", "dompurify": "^3.1.5", "react": "^17.0.2",