From f9b7a9b76109d21172347879d3f912666db595ab Mon Sep 17 00:00:00 2001 From: Mohammer5 Date: Wed, 1 May 2024 15:42:39 +0800 Subject: [PATCH 1/3] chore(github action): use node v20 in deploy tasks --- .github/workflows/dhis2-deploy-netlify.yml | 4 ++-- .github/workflows/dhis2-verify-lib.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dhis2-deploy-netlify.yml b/.github/workflows/dhis2-deploy-netlify.yml index e290aa4339..4ca3dc29a5 100644 --- a/.github/workflows/dhis2-deploy-netlify.yml +++ b/.github/workflows/dhis2-deploy-netlify.yml @@ -26,12 +26,12 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v1 with: - node-version: 14.x + node-version: 20.x - uses: c-hive/gha-yarn-cache@v1 - run: yarn install --frozen-lockfile - - run: yarn build + - run: yarn build:legacy - uses: nwtgck/actions-netlify@v1.1 with: diff --git a/.github/workflows/dhis2-verify-lib.yml b/.github/workflows/dhis2-verify-lib.yml index 1970b4a8c8..b66dd7c29d 100644 --- a/.github/workflows/dhis2-verify-lib.yml +++ b/.github/workflows/dhis2-verify-lib.yml @@ -29,7 +29,7 @@ jobs: NODE_OPTIONS=--openssl-legacy-provider yarn setup - name: Build - run: NODE_OPTIONS=--openssl-legacy-provider yarn build + run: yarn build:legacy - run: ./scripts/create-artifact.sh From 41438638bceb12d17a6320d5b8b4ec1622e407c6 Mon Sep 17 00:00:00 2001 From: Mohammer5 Date: Wed, 1 May 2024 19:30:45 +0800 Subject: [PATCH 2/3] chore: update to latest dhis2 cypress utils --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b8f1f51be7..79bcc3579a 100644 --- a/package.json +++ b/package.json @@ -63,8 +63,8 @@ "@dhis2/cli-app-scripts": "^8.0.0", "@dhis2/cli-style": "10.4.2", "@dhis2/cli-utils-docsite": "^3.1.2", - "@dhis2/cypress-commands": "^10.0.3", - "@dhis2/cypress-plugins": "^10.0.3", + "@dhis2/cypress-commands": "^10.0.4", + "@dhis2/cypress-plugins": "^10.0.4", "@manypkg/cli": "^0.18.0", "@svgr/cli": "^5.5.0", "@testing-library/jest-dom": "^5.16.1", From 25bea456705ceb42c4ba966392a078d7b77e3d0a Mon Sep 17 00:00:00 2001 From: ismay Date: Wed, 1 May 2024 13:37:18 +0200 Subject: [PATCH 3/3] chore: update lockfile --- yarn.lock | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9b0d7657b5..54de4ee1f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2609,17 +2609,17 @@ react-docgen "^6.0.0-alpha.0" url-join "^4.0.1" -"@dhis2/cypress-commands@^10.0.3": - version "10.0.3" - resolved "https://registry.yarnpkg.com/@dhis2/cypress-commands/-/cypress-commands-10.0.3.tgz#dae315cc839ff57965f307c2d2d34277c19592d4" - integrity sha512-K+GJtnzZGg62Qe67d/5Fl662s5VXnvhB55TTDoTcL/7Euawxyo1FC7ZrLXJExM2C1z0ic5WfZ7MH6EUsS6OfqQ== +"@dhis2/cypress-commands@^10.0.4": + version "10.0.4" + resolved "https://registry.yarnpkg.com/@dhis2/cypress-commands/-/cypress-commands-10.0.4.tgz#759e9cd9ebf7f03e61badb88930fcade2ae1781b" + integrity sha512-srR5tWbnCKuG3dldwWcv9GpUsEq46nE1KyABTEk4konT7jLVA7J87AfwhlOdEIv1iHN0fgAT5P3atd2IQmWtzw== dependencies: jscodeshift "^0.11.0" -"@dhis2/cypress-plugins@^10.0.3": - version "10.0.3" - resolved "https://registry.yarnpkg.com/@dhis2/cypress-plugins/-/cypress-plugins-10.0.3.tgz#83403aca333e2b356f7ea92c272d3ca00d00276d" - integrity sha512-MYIkWI/kCR4hoqvD+spmbXcdoNL/EFX3HZuyRCGUErj5ChJmyWX7jQtDq/twd7GFRma0IqwTtOwaiKAxLRv/Nw== +"@dhis2/cypress-plugins@^10.0.4": + version "10.0.4" + resolved "https://registry.yarnpkg.com/@dhis2/cypress-plugins/-/cypress-plugins-10.0.4.tgz#aaef0d1437a5469c0eb72d3cbb8eb6b92cc1048d" + integrity sha512-yOVasxprapavFCW7iGahnCIXxtJN51GPuSjjOFg+PWdvLQFkKhf1e5lPL3ALpOLr8rz9evd5Ex+4CBwnesMT9w== "@dhis2/d2-i18n@^1.1.0": version "1.1.0" @@ -23787,6 +23787,7 @@ workerpool@6.2.1: integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: + name wrap-ansi-cjs version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==