From 1c489c78bded3095e6a10ff0b132a33c159a547c Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Fernadez Date: Thu, 7 Nov 2024 19:42:39 -0600 Subject: [PATCH 01/10] lmendoza/9453-update-node-version --- .github/workflows/bld_yarn.yml | 2 +- .github/workflows/format_i18n.yml | 2 +- .github/workflows/format_prettier.yml | 2 +- .github/workflows/temp-storybook.yml | 2 +- .github/workflows/unit_tests.yml | 2 +- pom.xml | 4 +- yarn.lock | 269 ++++++++++---------------- 7 files changed, 105 insertions(+), 178 deletions(-) diff --git a/.github/workflows/bld_yarn.yml b/.github/workflows/bld_yarn.yml index c49a817946..ccd9f3382d 100644 --- a/.github/workflows/bld_yarn.yml +++ b/.github/workflows/bld_yarn.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 'v16.x' + node-version: 'v20.x' cache: 'yarn' - run: yarn - run: yarn build:${{ inputs.artifact_name }} diff --git a/.github/workflows/format_i18n.yml b/.github/workflows/format_i18n.yml index 8be2b275de..2ee5db2158 100644 --- a/.github/workflows/format_i18n.yml +++ b/.github/workflows/format_i18n.yml @@ -15,7 +15,7 @@ jobs: token: ${{ secrets.RELEASE_TOKEN }} - uses: actions/setup-node@v3 with: - node-version: 'v16.x' + node-version: 'v20.x' cache: 'yarn' - run: yarn - run: yarn build:i18n:generate-testing diff --git a/.github/workflows/format_prettier.yml b/.github/workflows/format_prettier.yml index e84ab2c3fb..3b0313239a 100644 --- a/.github/workflows/format_prettier.yml +++ b/.github/workflows/format_prettier.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 'v16.x' + node-version: 'v20.x' cache: 'yarn' - run: yarn diff --git a/.github/workflows/temp-storybook.yml b/.github/workflows/temp-storybook.yml index 8b3256d923..162eadcdbe 100644 --- a/.github/workflows/temp-storybook.yml +++ b/.github/workflows/temp-storybook.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 'v16.x' + node-version: 'v20.x' cache: 'yarn' - name: Install and Build run: | # Install npm packages and build the Storybook files diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 23c84b1579..dc35bb3d63 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 'v16.x' + node-version: 'v20.x' cache: 'yarn' - run: yarn - run: yarn test-headless diff --git a/pom.xml b/pom.xml index 4f0957309c..e80885632f 100644 --- a/pom.xml +++ b/pom.xml @@ -56,8 +56,8 @@ 1.8.0 - v16.20.0 - v1.22.18 + v20.15.0 + v1.22.2 https://nodejs.org/dist/ ${nodejs.workingDirectory} temp diff --git a/yarn.lock b/yarn.lock index 687060e390..54027b35c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2179,12 +2179,12 @@ integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== "@grpc/grpc-js@^1.0.0": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.11.1.tgz#a92f33e98f1959feffcd1b25a33b113d2c977b70" - integrity sha512-gyt/WayZrVPH2w/UTLansS7F9Nwld472JxxaETamrM8HNlsa+jSLNyKAZmhxI2Me4c3mQHFiS1wWHDY1g1Kthw== + version "1.9.9" + resolved "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.9.tgz" + integrity sha512-vQ1qwi/Kiyprt+uhb1+rHMpyk4CVRMTGNUGGPRGS7pLNfWkdCHrGEnT6T3/JyC2VZgoOX/X1KwdoU0WYQAeYcQ== dependencies: - "@grpc/proto-loader" "^0.7.13" - "@js-sdsl/ordered-map" "^4.4.2" + "@grpc/proto-loader" "^0.7.8" + "@types/node" ">=12.12.47" "@grpc/proto-loader@^0.5.0": version "0.5.6" @@ -2194,14 +2194,14 @@ lodash.camelcase "^4.3.0" protobufjs "^6.8.6" -"@grpc/proto-loader@^0.7.13": - version "0.7.13" - resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.13.tgz#f6a44b2b7c9f7b609f5748c6eac2d420e37670cf" - integrity sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw== +"@grpc/proto-loader@^0.7.8": + version "0.7.10" + resolved "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.10.tgz" + integrity sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ== dependencies: lodash.camelcase "^4.3.0" long "^5.0.0" - protobufjs "^7.2.5" + protobufjs "^7.2.4" yargs "^17.7.2" "@isaacs/cliui@^8.0.2": @@ -2323,11 +2323,6 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@js-sdsl/ordered-map@^4.4.2": - version "4.4.2" - resolved "https://registry.yarnpkg.com/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz#9299f82874bab9e4c7f9c48d865becbfe8d6907c" - integrity sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw== - "@juggle/resize-observer@^3.3.1": version "3.4.0" resolved "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.4.0.tgz" @@ -4699,7 +4694,7 @@ resolved "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== -"@types/node@>=10.0.0", "@types/node@>=13.7.0": +"@types/node@>=10.0.0", "@types/node@>=12.12.47", "@types/node@>=13.7.0": version "20.8.10" resolved "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz" integrity sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w== @@ -5950,10 +5945,28 @@ blocking-proxy@^1.0.0: dependencies: minimist "^1.2.0" -body-parser@1.20.3, body-parser@^1.19.0: - version "1.20.3" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6" - integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g== +body-parser@1.20.1: + version "1.20.1" + resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz" + integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== + dependencies: + bytes "3.1.2" + content-type "~1.0.4" + debug "2.6.9" + depd "2.0.0" + destroy "1.2.0" + http-errors "2.0.0" + iconv-lite "0.4.24" + on-finished "2.4.1" + qs "6.11.0" + raw-body "2.5.1" + type-is "~1.6.18" + unpipe "1.0.0" + +body-parser@^1.19.0: + version "1.20.2" + resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz" + integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== dependencies: bytes "3.1.2" content-type "~1.0.5" @@ -5963,7 +5976,7 @@ body-parser@1.20.3, body-parser@^1.19.0: http-errors "2.0.0" iconv-lite "0.4.24" on-finished "2.4.1" - qs "6.13.0" + qs "6.11.0" raw-body "2.5.2" type-is "~1.6.18" unpipe "1.0.0" @@ -6253,17 +6266,6 @@ call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5: get-intrinsic "^1.2.1" set-function-length "^1.1.1" -call-bind@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" - integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== - dependencies: - es-define-property "^1.0.0" - es-errors "^1.3.0" - function-bind "^1.1.2" - get-intrinsic "^1.2.4" - set-function-length "^1.2.1" - callsite@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz" @@ -6834,10 +6836,10 @@ cookie@0.3.1: resolved "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz" integrity sha512-+IJOX0OqlHCszo2mBUq+SrEbCj6w7Kpffqx60zYbPTFaO4+yYgRjHwcZNpWvaTylDHaV7PPmBHzSecZiMhtPgw== -cookie@0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" - integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== +cookie@0.5.0: + version "0.5.0" + resolved "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz" + integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== cookie@~0.4.1: version "0.4.2" @@ -7295,15 +7297,6 @@ define-data-property@^1.0.1, define-data-property@^1.1.1: gopd "^1.0.1" has-property-descriptors "^1.0.0" -define-data-property@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" - integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== - dependencies: - es-define-property "^1.0.0" - es-errors "^1.3.0" - gopd "^1.0.1" - define-lazy-prop@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz" @@ -7732,11 +7725,6 @@ encodeurl@~1.0.2: resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== -encodeurl@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58" - integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg== - encoding@^0.1.13: version "0.1.13" resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz" @@ -7869,18 +7857,6 @@ es-abstract@^1.22.1: unbox-primitive "^1.0.2" which-typed-array "^1.1.13" -es-define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" - integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== - dependencies: - get-intrinsic "^1.2.4" - -es-errors@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" - integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== - es-get-iterator@^1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz" @@ -8293,36 +8269,36 @@ exponential-backoff@^3.1.1: integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw== express@^4.17.3: - version "4.21.0" - resolved "https://registry.yarnpkg.com/express/-/express-4.21.0.tgz#d57cb706d49623d4ac27833f1cbc466b668eb915" - integrity sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng== + version "4.18.2" + resolved "https://registry.npmjs.org/express/-/express-4.18.2.tgz" + integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.20.3" + body-parser "1.20.1" content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.6.0" + cookie "0.5.0" cookie-signature "1.0.6" debug "2.6.9" depd "2.0.0" - encodeurl "~2.0.0" + encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" - finalhandler "1.3.1" + finalhandler "1.2.0" fresh "0.5.2" http-errors "2.0.0" - merge-descriptors "1.0.3" + merge-descriptors "1.0.1" methods "~1.1.2" on-finished "2.4.1" parseurl "~1.3.3" - path-to-regexp "0.1.10" + path-to-regexp "0.1.7" proxy-addr "~2.0.7" - qs "6.13.0" + qs "6.11.0" range-parser "~1.2.1" safe-buffer "5.2.1" - send "0.19.0" - serve-static "1.16.2" + send "0.18.0" + serve-static "1.15.0" setprototypeof "1.2.0" statuses "2.0.1" type-is "~1.6.18" @@ -8607,13 +8583,13 @@ finalhandler@1.1.2: statuses "~1.5.0" unpipe "~1.0.0" -finalhandler@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019" - integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ== +finalhandler@1.2.0: + version "1.2.0" + resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz" + integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== dependencies: debug "2.6.9" - encodeurl "~2.0.0" + encodeurl "~1.0.2" escape-html "~1.0.3" on-finished "2.4.1" parseurl "~1.3.3" @@ -9047,17 +9023,6 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@ has-symbols "^1.0.3" hasown "^2.0.0" -get-intrinsic@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" - integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== - dependencies: - es-errors "^1.3.0" - function-bind "^1.1.2" - has-proto "^1.0.1" - has-symbols "^1.0.3" - hasown "^2.0.0" - get-nonce@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz" @@ -9563,13 +9528,6 @@ has-property-descriptors@^1.0.0: dependencies: get-intrinsic "^1.2.2" -has-property-descriptors@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" - integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== - dependencies: - es-define-property "^1.0.0" - has-proto@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz" @@ -9832,9 +9790,9 @@ http-proxy-agent@^7.0.0: debug "^4.3.4" http-proxy-middleware@^2.0.3: - version "2.0.7" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6" - integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA== + version "2.0.6" + resolved "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz" + integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw== dependencies: "@types/http-proxy" "^1.17.8" http-proxy "^1.18.1" @@ -11739,9 +11697,9 @@ map-visit@^1.0.0: object-visit "^1.0.0" markdown-to-jsx@^7.1.8: - version "7.5.0" - resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-7.5.0.tgz#42ece0c71e842560a7d8bd9f81e7a34515c72150" - integrity sha512-RrBNcMHiFPcz/iqIj0n3wclzHXjwS7mzjBNWecKKVhNTIxQepIix6Il/wZCn2Cg5Y1ow2Qi84+eJrryFRWBEWw== + version "7.3.2" + resolved "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.3.2.tgz" + integrity sha512-B+28F5ucp83aQm+OxNrPkS8z0tMKaeHiy0lHJs3LqCyDQFtWuenaIrkaVTgAm1pf1AU85LXltva86hlaT17i8Q== marked@7.0.3: version "7.0.3" @@ -11808,10 +11766,10 @@ memorystream@^0.3.1: resolved "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz" integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw== -merge-descriptors@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5" - integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ== +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz" + integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== merge-source-map@1.0.4: version "1.0.4" @@ -13121,10 +13079,10 @@ path-scurry@^1.10.1: lru-cache "^9.1.1 || ^10.0.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" -path-to-regexp@0.1.10: - version "0.1.10" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b" - integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w== +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" + integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== path-type@^1.0.0: version "1.1.0" @@ -13487,10 +13445,10 @@ protobufjs@^6.8.6: "@types/node" ">=13.7.0" long "^4.0.0" -protobufjs@^7.2.5: - version "7.4.0" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.4.0.tgz#7efe324ce9b3b61c82aae5de810d287bc08a248a" - integrity sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw== +protobufjs@^7.2.4: + version "7.2.5" + resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz" + integrity sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -13665,12 +13623,12 @@ qjobs@^1.2.0: resolved "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz" integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg== -qs@6.13.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" - integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== +qs@6.11.0: + version "6.11.0" + resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== dependencies: - side-channel "^1.0.6" + side-channel "^1.0.4" qs@^6.10.0, qs@^6.11.2, qs@^6.7.0: version "6.11.2" @@ -13736,6 +13694,16 @@ raven@^2.2.1: timed-out "4.0.1" uuid "3.3.2" +raw-body@2.5.1: + version "2.5.1" + resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz" + integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== + dependencies: + bytes "3.1.2" + http-errors "2.0.0" + iconv-lite "0.4.24" + unpipe "1.0.0" + raw-body@2.5.2: version "2.5.2" resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz" @@ -14323,9 +14291,9 @@ robots-parser@^2.0.1: integrity sha512-oO8f2SI04dJk3pbj2KOMJ4G6QfPAgqcGmrYGmansIcpRewIPT2ljWEt5I+ip6EgiyaLo+RXkkUWw74M25HDkMA== rollup@^3.25.2: - version "3.29.5" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.5.tgz#8a2e477a758b520fb78daf04bca4c522c1da8a54" - integrity sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w== + version "3.29.4" + resolved "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz" + integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw== optionalDependencies: fsevents "~2.3.2" @@ -14548,26 +14516,7 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1: resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -send@0.19.0: - version "0.19.0" - resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8" - integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw== - dependencies: - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "2.0.0" - mime "1.6.0" - ms "2.1.3" - on-finished "2.4.1" - range-parser "~1.2.1" - statuses "2.0.1" - -send@latest: +send@0.18.0, send@latest: version "0.18.0" resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz" integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== @@ -14613,15 +14562,15 @@ serve-index@^1.9.1: mime-types "~2.1.17" parseurl "~1.3.2" -serve-static@1.16.2: - version "1.16.2" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296" - integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw== +serve-static@1.15.0: + version "1.15.0" + resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz" + integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== dependencies: - encodeurl "~2.0.0" + encodeurl "~1.0.2" escape-html "~1.0.3" parseurl "~1.3.3" - send "0.19.0" + send "0.18.0" set-blocking@^2.0.0: version "2.0.0" @@ -14638,18 +14587,6 @@ set-function-length@^1.1.1: gopd "^1.0.1" has-property-descriptors "^1.0.0" -set-function-length@^1.2.1: - version "1.2.2" - resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" - integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== - dependencies: - define-data-property "^1.1.4" - es-errors "^1.3.0" - function-bind "^1.1.2" - get-intrinsic "^1.2.4" - gopd "^1.0.1" - has-property-descriptors "^1.0.2" - set-function-name@^2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz" @@ -14734,16 +14671,6 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -side-channel@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" - integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== - dependencies: - call-bind "^1.0.7" - es-errors "^1.3.0" - get-intrinsic "^1.2.4" - object-inspect "^1.13.1" - signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz" From 61ac373c4d1ed889aafbf8061acea2d9fa209375 Mon Sep 17 00:00:00 2001 From: Giles Westwood Date: Tue, 12 Nov 2024 17:44:45 +0000 Subject: [PATCH 02/10] convert to matrix format and bump all action versions for node version --- .github/workflows/bld_all.yml | 111 ----------------- .github/workflows/bld_all_docker.yml | 89 ------------- .github/workflows/bld_all_yarn.yml | 27 ---- .github/workflows/bld_docker.yml | 44 +++++-- .../workflows/{bld_maven.yml => bld_mvn.yml} | 27 ++-- ...t_release_tag.yml => bld_test_rel_tag.yml} | 32 +++-- .github/workflows/bld_yarn.yml | 12 +- .github/workflows/build_test_release.yml | 117 ------------------ .github/workflows/format_i18n.yml | 6 +- .github/workflows/format_prettier.yml | 6 +- .github/workflows/lint.yml | 2 +- .github/workflows/pr.yml | 8 +- .github/workflows/pushmain.yml | 4 +- .github/workflows/rel_tag.yml | 2 +- .github/workflows/temp-storybook.yml | 8 +- .../{unit_tests.yml => test_yarn.yml} | 8 +- 16 files changed, 97 insertions(+), 406 deletions(-) delete mode 100644 .github/workflows/bld_all.yml delete mode 100644 .github/workflows/bld_all_docker.yml delete mode 100644 .github/workflows/bld_all_yarn.yml rename .github/workflows/{bld_maven.yml => bld_mvn.yml} (91%) rename .github/workflows/{build_test_release_tag.yml => bld_test_rel_tag.yml} (86%) delete mode 100644 .github/workflows/build_test_release.yml rename .github/workflows/{unit_tests.yml => test_yarn.yml} (67%) diff --git a/.github/workflows/bld_all.yml b/.github/workflows/bld_all.yml deleted file mode 100644 index 5a0413bc8e..0000000000 --- a/.github/workflows/bld_all.yml +++ /dev/null @@ -1,111 +0,0 @@ -name: bld_all - -#NOTE: this deploys assets as well as builds - -permissions: - checks: write - contents: read - issues: read - pull-requests: write - -on: - workflow_call: - inputs: - version_tag: - description: 'Version tag to use: (bump must also be set to none to keep a specific version' - required: false - default: 'latest' - type: string - bump: - description: 'whether to bump the version number by a major minor patch' - required: false - default: 'patch' - type: string - ref: - description: 'git reference to use with the checkout use default_branch to have that calculated' - required: false - default: "default" - type: string - - workflow_dispatch: - inputs: - version_tag: - description: 'Version tag to use: (bump must also be set to none to keep a specific version' - required: false - default: 'latest' - type: string - bump: - description: | - How to optionally bump the semver version ( Major.Minor.Patch ) : git log will be searched for - '#major #minor #patch' or feat/ or fix/ branch names to optionally override the bump. Set to none to keep a specific version - required: false - options: - - patch - - minor - - major - - none - type: choice - ref: - description: 'git reference to use with the checkout use default_branch to have that calculated' - required: false - default: "default" - type: string - - - -jobs: - bld_prod: - uses: ./.github/workflows/bld_maven.yml - secrets: inherit # pass all secrets - permissions: - checks: write - contents: read - issues: read - pull-requests: write - with: - artifact_name: prod - version_tag: ${{ inputs.version_tag }} - bump: ${{ inputs.bump }} - ref: ${{ inputs.ref }} - - bld_sandbox: - uses: ./.github/workflows/bld_maven.yml - secrets: inherit # pass all secrets - permissions: - checks: write - contents: read - issues: read - pull-requests: write - with: - artifact_name: sandbox - version_tag: ${{ inputs.version_tag }} - bump: ${{ inputs.bump }} - ref: ${{ inputs.ref }} - - bld_qa: - uses: ./.github/workflows/bld_maven.yml - secrets: inherit # pass all secrets - permissions: - checks: write - contents: read - issues: read - pull-requests: write - with: - artifact_name: qa - version_tag: ${{ inputs.version_tag }} - bump: ${{ inputs.bump }} - ref: ${{ inputs.ref }} - - bld_int: - uses: ./.github/workflows/bld_maven.yml - secrets: inherit # pass all secrets - permissions: - checks: write - contents: read - issues: read - pull-requests: write - with: - artifact_name: int - version_tag: ${{ inputs.version_tag }} - bump: ${{ inputs.bump }} - ref: ${{ inputs.ref }} diff --git a/.github/workflows/bld_all_docker.yml b/.github/workflows/bld_all_docker.yml deleted file mode 100644 index 3dd354d64c..0000000000 --- a/.github/workflows/bld_all_docker.yml +++ /dev/null @@ -1,89 +0,0 @@ -name: bld_all_docker - -permissions: - checks: write - contents: read - issues: read - pull-requests: write - -on: - workflow_call: - inputs: - version_tag: - description: 'Version tag to use: (bump must also be set to none to keep a specific version' - required: false - default: 'latest' - type: string - bump: - description: 'whether to bump the version number by a major minor patch' - required: false - default: 'patch' - type: string - ref: - description: 'git reference to use with the checkout use default_branch to have that calculated' - required: false - default: "default" - type: string - - workflow_dispatch: - inputs: - version_tag: - description: 'Version tag to use: (bump must also be set to none to keep a specific version' - required: false - default: 'latest' - type: string - bump: - description: 'whether to bump the version number by a major minor patch' - required: false - default: 'patch' - type: string - ref: - description: 'git reference to use with the checkout use default_branch to have that calculated' - required: false - default: "default" - type: string - -jobs: - - bld_angular_prod: - uses: ./.github/workflows/bld_docker.yml - secrets: inherit # pass all secrets - with: - docker_name: orcid/registry/orcid-web-frontend-prod - context: . - version_tag: ${{ inputs.version_tag }} - bump: ${{ inputs.bump }} - build_args: "build_env=prod" - file: Dockerfile.build - bld_angular_sandbox: - uses: ./.github/workflows/bld_docker.yml - secrets: inherit # pass all secrets - with: - docker_name: orcid/registry/orcid-web-frontend-sandbox - context: . - version_tag: ${{ inputs.version_tag }} - bump: ${{ inputs.bump }} - build_args: "build_env=sandbox" - file: Dockerfile.build - bld_angular_qa: - uses: ./.github/workflows/bld_docker.yml - secrets: inherit # pass all secrets - with: - docker_name: orcid/registry/orcid-web-frontend-qa - context: . - version_tag: ${{ inputs.version_tag }} - bump: ${{ inputs.bump }} - build_args: "build_env=qa" - file: Dockerfile.build - bld_angular_int: - uses: ./.github/workflows/bld_docker.yml - secrets: inherit # pass all secrets - with: - docker_name: orcid/registry/orcid-web-frontend-int - context: . - version_tag: ${{ inputs.version_tag }} - bump: ${{ inputs.bump }} - build_args: "build_env=int" - file: Dockerfile.build - - diff --git a/.github/workflows/bld_all_yarn.yml b/.github/workflows/bld_all_yarn.yml deleted file mode 100644 index 26a8955446..0000000000 --- a/.github/workflows/bld_all_yarn.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: bld_all_yarn - -on: - workflow_call: - - workflow_dispatch: - -jobs: - bld_prod: - uses: ./.github/workflows/bld_yarn.yml - with: - artifact_name: prod -# bld_sandbox: -# uses: ./.github/workflows/bld_yarn.yml -# with: -# artifact_name: sandbox -# -# bld_qa: -# uses: ./.github/workflows/bld_yarn.yml -# with: -# artifact_name: qa -# -# bld_int: -# uses: ./.github/workflows/bld_yarn.yml -# with: -# artifact_name: int -# diff --git a/.github/workflows/bld_docker.yml b/.github/workflows/bld_docker.yml index 8402339f60..fb0bdb38e0 100644 --- a/.github/workflows/bld_docker.yml +++ b/.github/workflows/bld_docker.yml @@ -1,5 +1,4 @@ name: bld_docker -run-name: ${{ inputs.docker_name }} permissions: checks: write @@ -21,7 +20,7 @@ on: default: "." type: string build_args: - description: 'arguments' + description: 'build_args e.g wibble=blar' required: false default: "" type: string @@ -59,7 +58,7 @@ on: default: "." type: string build_args: - description: 'arguments' + description: 'build_args e.g wibble=blar' required: false default: "" type: string @@ -87,6 +86,29 @@ on: jobs: bld_docker: + strategy: + matrix: + include: + - artifact_name: prod + docker_name: orcid/registry/orcid-web-frontend-prod + build_args: "build_env=prod" + file: Dockerfile.build + + - artifact_name: sandbox + docker_name: orcid/registry/orcid-web-frontend-sandbox + build_args: "build_env=sandbox" + file: Dockerfile.build + + - artifact_name: qa + docker_name: orcid/registry/orcid-web-frontend-qa + build_args: "build_env=qa" + file: Dockerfile.build + + - artifact_name: int + docker_name: orcid/registry/orcid-web-frontend-int + build_args: "build_env=int" + file: Dockerfile.build + runs-on: ubuntu-latest steps: - name: git-checkout-ref-action @@ -96,7 +118,7 @@ jobs: default_branch: ${{ github.event.repository.default_branch }} ref: ${{ inputs.ref }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ steps.ref.outputs.ref }} # checkout some history so we can scan commits for bump messages @@ -110,8 +132,8 @@ jobs: version_tag: ${{ inputs.version_tag }} bump: ${{ inputs.bump }} - - uses: docker/setup-buildx-action@v2 - - uses: actions/cache@v3 + - uses: docker/setup-buildx-action@v3 + - uses: actions/cache@v4 with: path: /tmp/.buildx-cache # each cache needs a unique key for the job @@ -121,7 +143,7 @@ jobs: restore-keys: | ${{ runner.os }}-buildx- - name: Login to private registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ secrets.DOCKER_REG_PRIVATE }} username: ${{ secrets.DOCKER_USER }} @@ -130,20 +152,20 @@ jobs: - name: nasty hack to allow dynamic defaults id: dynamic_defaults run: | - FILE="${{ github.event.inputs.file }}" + FILE="${{ matrix.file }}" echo "default_file=${FILE:-${{ inputs.context }}/Dockerfile}" >> "$GITHUB_OUTPUT" - name: show the dynamic defaults run: | echo ${{ steps.dynamic_defaults.outputs.default_file }} - - uses: docker/build-push-action@v3 + - uses: docker/build-push-action@v6 with: push: true - tags: ${{ secrets.DOCKER_REG_PRIVATE }}/${{ inputs.docker_name}}:${{ steps.version.outputs.version_tag_numeric }} + tags: ${{ secrets.DOCKER_REG_PRIVATE }}/${{ matrix.docker_name}}:${{ steps.version.outputs.version_tag_numeric }} context: ${{ inputs.context }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache - build-args: ${{ inputs.build_args }} + build-args: ${{ matrix.build_args }} file: ${{ steps.dynamic_defaults.outputs.default_file }} diff --git a/.github/workflows/bld_maven.yml b/.github/workflows/bld_mvn.yml similarity index 91% rename from .github/workflows/bld_maven.yml rename to .github/workflows/bld_mvn.yml index ca055263e5..8e040c89f4 100644 --- a/.github/workflows/bld_maven.yml +++ b/.github/workflows/bld_mvn.yml @@ -1,5 +1,4 @@ -name: bld_maven -run-name: bld-{{ inputs.artifact_name }} +name: bld_mvn permissions: checks: write @@ -61,7 +60,15 @@ on: type: string jobs: - bld_maven: + bld_mvn: + strategy: + matrix: + include: + - artifact_name: prod + - artifact_name: sandbox + - artifact_name: qa + - artifact_name: int + runs-on: ubuntu-latest steps: - name: git-checkout-ref-action @@ -71,7 +78,7 @@ jobs: default_branch: ${{ github.event.repository.default_branch }} ref: ${{ inputs.ref }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ steps.ref.outputs.ref }} # checkout some history so we can scan commits for bump messages @@ -86,18 +93,12 @@ jobs: bump: ${{ inputs.bump }} - name: Set up Open JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '11' cache: 'maven' -# FIXME: think that maven somehow pulls this in, so never cached -# - name: setup node -# uses: actions/setup-node@v3 -# with: -# node-version: 'v16.x' - - name: show path run: | echo "$PATH" @@ -109,7 +110,7 @@ jobs: shell: bash env: version_tag_numeric: '${{ steps.version.outputs.version_tag_numeric }}' - project: '${{ inputs.artifact_name }}' + project: '${{ matrix.artifact_name }}' - name: bump version using prod profile run: | @@ -147,4 +148,4 @@ jobs: ARTIFACT_REPO_PATH: '${{ secrets.ARTIFACT_REPO_PATH }}' ARTIFACT_USER: '${{ secrets.ARTIFACT_USER }}' ARTIFACT_PASSWORD: '${{ secrets.ARTIFACT_PASSWORD }}' - build_env: '${{ inputs.artifact_name }}' + build_env: '${{ matrix.artifact_name }}' diff --git a/.github/workflows/build_test_release_tag.yml b/.github/workflows/bld_test_rel_tag.yml similarity index 86% rename from .github/workflows/build_test_release_tag.yml rename to .github/workflows/bld_test_rel_tag.yml index 2bb93024de..fabce5eeeb 100644 --- a/.github/workflows/build_test_release_tag.yml +++ b/.github/workflows/bld_test_rel_tag.yml @@ -1,4 +1,4 @@ -name: build_test_release_tag +name: bld_test_rel_tag on: workflow_call: @@ -42,7 +42,11 @@ on: required: false default: "default_branch" type: string - + rel_tag: + description: Whether to tag the code + type: boolean + required: false + default: true # cancel running job if another commit comes in concurrency: @@ -66,26 +70,27 @@ jobs: - format_i18n - format_prettier - unit_tests: - uses: ./.github/workflows/unit_tests.yml + test_yarn: + uses: ./.github/workflows/test_yarn.yml needs: - format_i18n - format_prettier # this is a test - bld_all_yarn: - uses: ./.github/workflows/bld_all_yarn.yml + bld_yarn: + uses: ./.github/workflows/bld_yarn.yml needs: - format_i18n - format_prettier ############################################################################## - bld_all: - uses: ./.github/workflows/bld_all.yml + # uses maven to build via yarn into a war file + bld_mvn: + uses: ./.github/workflows/bld_mvn.yml secrets: inherit # pass all secrets for uploading assets needs: - lint - - bld_all_yarn + - bld_yarn - format_i18n - format_prettier permissions: @@ -98,12 +103,12 @@ jobs: bump: ${{ inputs.bump }} ref: ${{ inputs.ref }} - bld_all_docker: - uses: ./.github/workflows/bld_all_docker.yml + bld_docker: + uses: ./.github/workflows/bld_docker.yml secrets: inherit # pass all secrets for uploading assets needs: - lint - - bld_all_yarn + - bld_yarn - format_i18n - format_prettier permissions: @@ -120,7 +125,8 @@ jobs: rel_tag: uses: ./.github/workflows/rel_tag.yml - needs: bld_all + if: ${{ inputs.rel_tag }} + needs: bld_mvn with: version_tag: ${{ inputs.version_tag }} bump: ${{ inputs.bump }} diff --git a/.github/workflows/bld_yarn.yml b/.github/workflows/bld_yarn.yml index ccd9f3382d..ebf7050343 100644 --- a/.github/workflows/bld_yarn.yml +++ b/.github/workflows/bld_yarn.yml @@ -1,5 +1,4 @@ name: bld_yarn -run-name: bld-{{ inputs.artifact_name }} permissions: checks: write @@ -25,10 +24,17 @@ on: jobs: bld_yarn: + strategy: + matrix: + include: + - artifact_name: prod + - artifact_name: sandbox + - artifact_name: qa + - artifact_name: int runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 'v20.x' cache: 'yarn' diff --git a/.github/workflows/build_test_release.yml b/.github/workflows/build_test_release.yml deleted file mode 100644 index 209d9196d2..0000000000 --- a/.github/workflows/build_test_release.yml +++ /dev/null @@ -1,117 +0,0 @@ -name: build_test_release - -on: - workflow_call: - inputs: - version_tag: - description: 'version tag to use' - required: false - default: "latest" - type: string - bump: - description: 'whether to bump the version number by a major minor patch amount or try gitlog' - required: false - default: "patch" - type: string - ref: - description: 'git reference to use with the checkout use default_branch to have that calculated' - required: false - default: "default" - type: string - - workflow_dispatch: - inputs: - version_tag: - description: 'version tag to use' - required: false - default: "latest" - type: string - bump: - description: | - How to optionally bump the semver version ( Major.Minor.Patch ) : git log will be searched for - '#major #minor #patch' or feat/ or fix/ branch names to optionally override the bump. Set to none to keep a specific version - required: false - options: - - patch - - minor - - major - - none - type: choice - ref: - description: 'git reference to use with the checkout use default_branch to have that calculated' - required: false - default: "default_branch" - type: string - - -# cancel running job if another commit comes in -concurrency: - group: main-${{ github.ref }}-1 - cancel-in-progress: true - -jobs: - format_i18n: - uses: ./.github/workflows/format_i18n.yml - secrets: inherit # pass all secrets for pushing - - format_prettier: - uses: ./.github/workflows/format_prettier.yml - secrets: inherit # pass all secrets for pushing - -############################################################################## - - lint: - uses: ./.github/workflows/lint.yml - needs: - - format_i18n - - format_prettier - - unit_tests: - uses: ./.github/workflows/unit_tests.yml - needs: - - format_i18n - - format_prettier - - # this is a test - bld_all_yarn: - uses: ./.github/workflows/bld_all_yarn.yml - needs: - - format_i18n - - format_prettier - -############################################################################## - bld_all: - uses: ./.github/workflows/bld_all.yml - secrets: inherit # pass all secrets for uploading assets - needs: - - lint - - bld_all_yarn - - format_i18n - - format_prettier - permissions: - checks: write - contents: read - issues: read - pull-requests: write - with: - version_tag: ${{ inputs.version_tag }} - bump: ${{ inputs.bump }} - ref: ${{ inputs.ref }} - - bld_all_docker: - uses: ./.github/workflows/bld_all_docker.yml - secrets: inherit # pass all secrets for uploading assets - needs: - - lint - - bld_all_yarn - - format_i18n - - format_prettier - permissions: - checks: write - contents: read - issues: read - pull-requests: write - with: - version_tag: ${{ inputs.version_tag }} - bump: ${{ inputs.bump }} - ref: ${{ inputs.ref }} diff --git a/.github/workflows/format_i18n.yml b/.github/workflows/format_i18n.yml index 2ee5db2158..06efcd942d 100644 --- a/.github/workflows/format_i18n.yml +++ b/.github/workflows/format_i18n.yml @@ -8,12 +8,12 @@ jobs: format_i18n: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # token with write permissions to protected branches # standard github token does not allow this token: ${{ secrets.RELEASE_TOKEN }} - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 'v20.x' cache: 'yarn' @@ -22,7 +22,7 @@ jobs: - name: add and commit any files that have changed id: add_and_commit - uses: EndBug/add-and-commit@c8bfb4ff65642c4c54445500822f6e7da558994a + uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9.1.4 with: message: '🤖 GITHUB ACTIONS i18n generator' env: diff --git a/.github/workflows/format_prettier.yml b/.github/workflows/format_prettier.yml index 3b0313239a..da3020c14d 100644 --- a/.github/workflows/format_prettier.yml +++ b/.github/workflows/format_prettier.yml @@ -8,13 +8,13 @@ jobs: format_prettier: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # token with write permissions to protected branches # standard github token does not allow this token: ${{ secrets.RELEASE_TOKEN }} - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 'v20.x' cache: 'yarn' @@ -24,7 +24,7 @@ jobs: - name: add and commit any files that have changed id: add_and_commit - uses: EndBug/add-and-commit@c8bfb4ff65642c4c54445500822f6e7da558994a + uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9.1.4 with: message: '🤖 GITHUB ACTIONS format_prettier' env: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a75a9f27b1..71e5200276 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,7 @@ jobs: pre-commit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: '3.10' diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index cf7416b071..7c862e1355 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -17,12 +17,12 @@ concurrency: cancel-in-progress: true jobs: - unit_tests: - uses: ./.github/workflows/unit_tests.yml + test_yarn: + uses: ./.github/workflows/test_yarn.yml # NOTE: this is just to test - bld_all_yarn: - uses: ./.github/workflows/bld_all_yarn.yml + bld_yarn: + uses: ./.github/workflows/bld_yarn.yml # NOTE: codeql is only available on public repos or enterprise github accounts # codeql: # uses: ./.github/workflows/codeql.yml diff --git a/.github/workflows/pushmain.yml b/.github/workflows/pushmain.yml index f45606ef3f..7a5990725d 100644 --- a/.github/workflows/pushmain.yml +++ b/.github/workflows/pushmain.yml @@ -20,8 +20,8 @@ concurrency: cancel-in-progress: false jobs: - build_test_release_tag: - uses: ./.github/workflows/build_test_release_tag.yml + bld_test_rel_tag: + uses: ./.github/workflows/bld_test_rel_tag.yml secrets: inherit # pass all secrets for pushing with: # NOTE: passing in a specific branch means that commits made during the pipeline before the final build is completed will be included diff --git a/.github/workflows/rel_tag.yml b/.github/workflows/rel_tag.yml index 6fb07a9ac4..f06dd0e507 100644 --- a/.github/workflows/rel_tag.yml +++ b/.github/workflows/rel_tag.yml @@ -64,7 +64,7 @@ jobs: ref: ${{ inputs.ref }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # token with write permissions to protected branches # standard github token does not allow this diff --git a/.github/workflows/temp-storybook.yml b/.github/workflows/temp-storybook.yml index 162eadcdbe..6c5b89fc76 100644 --- a/.github/workflows/temp-storybook.yml +++ b/.github/workflows/temp-storybook.yml @@ -11,8 +11,8 @@ jobs: build-and-deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 'v20.x' cache: 'yarn' @@ -20,7 +20,7 @@ jobs: run: | # Install npm packages and build the Storybook files yarn install yarn run build:storybook - - name: Deploy + - name: Deploy uses: JamesIves/github-pages-deploy-action@v4 with: - FOLDER: dist/storybook/ng-orcid # The folder that the build-storybook script generates files. \ No newline at end of file + FOLDER: dist/storybook/ng-orcid # The folder that the build-storybook script generates files. diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/test_yarn.yml similarity index 67% rename from .github/workflows/unit_tests.yml rename to .github/workflows/test_yarn.yml index dc35bb3d63..4e4ff0a919 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/test_yarn.yml @@ -2,14 +2,14 @@ on: workflow_call: workflow_dispatch: -name: unit_tests +name: test_yarn jobs: - unit_tests: + test_yarn: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 'v20.x' cache: 'yarn' From 54d1e747456cbbe855157cd19fbbe5d9b397bd5d Mon Sep 17 00:00:00 2001 From: github actions Date: Tue, 12 Nov 2024 17:53:05 +0000 Subject: [PATCH 03/10] v2.107.9 changelog update --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1de64907f..1a3150286c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v2.107.9 - 2024-11-12 + +[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.8...v2.107.9) + +- [#2390](https://github.com/ORCID/orcid-angular/pull/2390): lmendoza/9453-update-node-version + ## v2.107.8 - 2024-11-11 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.7...v2.107.8) From 145fd12a9e7eb892b085ed2e1da2e96be6b61207 Mon Sep 17 00:00:00 2001 From: Giles Westwood Date: Tue, 12 Nov 2024 18:15:56 +0000 Subject: [PATCH 04/10] cleanup: map workflow name to filename --- .github/workflows/temp-storybook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/temp-storybook.yml b/.github/workflows/temp-storybook.yml index 6c5b89fc76..47f53ec5be 100644 --- a/.github/workflows/temp-storybook.yml +++ b/.github/workflows/temp-storybook.yml @@ -1,4 +1,4 @@ -name: Build and Deploy +name: temp-storybook on: push: From 7200489d55e923e44774ec459304cc3b4b3aea6c Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Tue, 12 Nov 2024 20:20:14 +0200 Subject: [PATCH 05/10] scroll to top on email interstitial --- .../share-emails-domains/share-emails-domains.component.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.ts b/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.ts index 37394b38cd..be75d51a8b 100644 --- a/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.ts +++ b/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.ts @@ -1,9 +1,10 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core' +import { Component, EventEmitter, Inject, Input, Output } from '@angular/core' import { PlatformInfoService } from '../../platform-info' import { AssertionVisibilityString, EmailsEndpoint } from 'src/app/types' import { FormBuilder, FormControl, FormGroup } from '@angular/forms' import { RecordEmailsService } from 'src/app/core/record-emails/record-emails.service' import { error } from 'console' +import { WINDOW } from '../../window' @Component({ selector: 'app-share-emails-domains', @@ -23,12 +24,14 @@ export class ShareEmailsDomainsComponent { constructor( public platformInfo: PlatformInfoService, private fb: FormBuilder, - private recordEmailsService: RecordEmailsService + private recordEmailsService: RecordEmailsService, + @Inject(WINDOW) private window: Window ) {} public loadingEmails = true @Output() finish = new EventEmitter() ngOnInit() { + this.window.scrollTo(0, 0) this.userPrivateDomains = this.getTop3MostRecentPrivateDomains( this.userEmailsJson ) From 3ca10ef1abf62fe70deec93d1d92a11dede156ce Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Tue, 12 Nov 2024 20:35:55 +0200 Subject: [PATCH 06/10] fix test --- .../share-emails-domains.component.spec.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.spec.ts b/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.spec.ts index fd7032fe57..cb70bcf5b6 100644 --- a/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.spec.ts +++ b/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.spec.ts @@ -4,6 +4,8 @@ import { ShareEmailsDomainsComponent } from './share-emails-domains.component' import { FormBuilder, FormControl, FormGroup } from '@angular/forms' import { RecordEmailsService } from 'src/app/core/record-emails/record-emails.service' import { PlatformInfoService } from '../../platform-info' +import { WINDOW_PROVIDERS } from '../../window' +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core' describe('ShareEmailsDomainsComponent', () => { let component: ShareEmailsDomainsComponent @@ -28,7 +30,9 @@ describe('ShareEmailsDomainsComponent', () => { provide: RecordEmailsService, useValue: {}, }, + WINDOW_PROVIDERS, ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], }) fixture = TestBed.createComponent(ShareEmailsDomainsComponent) component = fixture.componentInstance From 4d1bb4a35030b5b4235aab76fb1f73ab4c93912b Mon Sep 17 00:00:00 2001 From: github actions Date: Tue, 12 Nov 2024 19:47:50 +0000 Subject: [PATCH 07/10] 2.107.10 changelog update --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a3150286c..85229deb5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 2.107.10 - 2024-11-12 + +[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.9...2.107.10) + +- [#2395](https://github.com/ORCID/orcid-angular/pull/2395): scroll to top on email interstitial +- [#2394](https://github.com/ORCID/orcid-angular/pull/2394): convert to matrix format and bump all action versions for node version + ## v2.107.9 - 2024-11-12 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.8...v2.107.9) From 05f130e7c144602c4990a50fabb308789d489ed5 Mon Sep 17 00:00:00 2001 From: Giles Westwood Date: Tue, 12 Nov 2024 23:53:48 +0000 Subject: [PATCH 08/10] missing tagging default --- .github/workflows/bld_test_rel_tag.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/bld_test_rel_tag.yml b/.github/workflows/bld_test_rel_tag.yml index fabce5eeeb..f256a4002f 100644 --- a/.github/workflows/bld_test_rel_tag.yml +++ b/.github/workflows/bld_test_rel_tag.yml @@ -18,6 +18,11 @@ on: required: false default: "default" type: string + rel_tag: + description: Whether to tag the code + type: boolean + required: false + default: true workflow_dispatch: inputs: From e030567c36b3e36e571b5fc23a19fab807a3b941 Mon Sep 17 00:00:00 2001 From: Giles Westwood Date: Tue, 12 Nov 2024 23:59:27 +0000 Subject: [PATCH 09/10] fix: bump linting action versions --- .github/workflows/lint.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 71e5200276..f7e9c0d9a3 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,16 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.10' - - name: set PY - run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> "$GITHUB_ENV" - - uses: actions/cache@v3 - with: - path: ~/.cache - key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} - # lockdown all 3rd party repos to git shas - #- uses: cloudposse/github-action-pre-commit@32acf3179b9eda817c0f549e8057477d320827db - # migrate to standard pre-commit - - uses: pre-commit/action@5f528da5c95691c4cf42ff76a4d10854b62cbb82 + - uses: pre-commit/action@576ff52938d158a24ac7e009dfa94b1455e7df99 From 55d4a01194ac44b45db130365060d2d0695c1a06 Mon Sep 17 00:00:00 2001 From: github actions Date: Wed, 13 Nov 2024 20:26:07 +0000 Subject: [PATCH 10/10] 2.108.0 changelog update --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85229deb5a..79a6193dfe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## 2.108.0 - 2024-11-13 + +[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.9...2.108.0) + +- [#2395](https://github.com/ORCID/orcid-angular/pull/2395): scroll to top on email interstitial +- [#2394](https://github.com/ORCID/orcid-angular/pull/2394): convert to matrix format and bump all action versions for node version + +### Fix + +- bump linting action versions + ## 2.107.10 - 2024-11-12 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.9...2.107.10)