From bc6641381819d32a2455cd05549d7e6f55f47ba8 Mon Sep 17 00:00:00 2001 From: Basile Spaenlehauer Date: Thu, 12 Dec 2024 12:27:02 +0100 Subject: [PATCH] fix: ci issues (#542) * fix: ci issues * fix: update lock * fix: deployment --- .github/workflows/deploy-dev.yml | 9 ++-- .github/workflows/deploy-prod.yml | 9 ++-- .github/workflows/deploy-stage.yml | 9 ++-- cypress.config.ts | 2 +- eslint.config.js | 1 + package.json | 4 +- pnpm-lock.yaml | 69 ------------------------------ 7 files changed, 15 insertions(+), 88 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 960e3f347..a1fa19e08 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -58,8 +58,7 @@ jobs: # Replace input build-folder or version if needed with: build-folder: "build" - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_DEV }} - aws-region: ${{ secrets.AWS_REGION_DEV }} - aws-s3-bucket-name: ${{ secrets.AWS_S3_BUCKET_NAME_GRAASP_ACCOUNT_DEV }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_DEV }} - cloudfront-distribution-id: ${{ secrets.CLOUDFRONT_DISTRIBUTION_GRAASP_ACCOUNT_DEV }} + role-to-assume: ${{ secrets.AWS_ROLE }} + aws-region: ${{ vars.AWS_REGION }} + aws-s3-bucket-name: ${{ vars.AWS_S3_BUCKET_NAME }} + cloudfront-distribution-id: ${{ vars.AWS_CLOUDFRONT_DISTRIBUTION_ID }} diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 205a50b94..b62fc29cb 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -61,8 +61,7 @@ jobs: # Replace input build-folder or version if needed with: build-folder: "build" - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_PROD }} - aws-region: ${{ secrets.AWS_REGION_PROD }} - aws-s3-bucket-name: ${{ secrets.AWS_S3_BUCKET_NAME_GRAASP_ACCOUNT }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_PROD }} - cloudfront-distribution-id: ${{ secrets.CLOUDFRONT_DISTRIBUTION_GRAASP_ACCOUNT }} + role-to-assume: ${{ secrets.AWS_ROLE }} + aws-region: ${{ vars.AWS_REGION }} + aws-s3-bucket-name: ${{ vars.AWS_S3_BUCKET_NAME }} + cloudfront-distribution-id: ${{ vars.AWS_CLOUDFRONT_DISTRIBUTION_ID }} diff --git a/.github/workflows/deploy-stage.yml b/.github/workflows/deploy-stage.yml index 3672afe62..a9a1ee3b8 100644 --- a/.github/workflows/deploy-stage.yml +++ b/.github/workflows/deploy-stage.yml @@ -61,8 +61,7 @@ jobs: # Replace input build-folder or version if needed with: build-folder: "build" - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_STAGE }} - aws-region: ${{ secrets.AWS_REGION_STAGE }} - aws-s3-bucket-name: ${{ secrets.AWS_S3_BUCKET_NAME_GRAASP_ACCOUNT_STAGE }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_STAGE }} - cloudfront-distribution-id: ${{ secrets.CLOUDFRONT_DISTRIBUTION_GRAASP_ACCOUNT_STAGE }} + role-to-assume: ${{ secrets.AWS_ROLE }} + aws-region: ${{ vars.AWS_REGION }} + aws-s3-bucket-name: ${{ vars.AWS_S3_BUCKET_NAME }} + cloudfront-distribution-id: ${{ vars.AWS_CLOUDFRONT_DISTRIBUTION_ID }} diff --git a/cypress.config.ts b/cypress.config.ts index 8cfb93e78..c2b8dce91 100644 --- a/cypress.config.ts +++ b/cypress.config.ts @@ -1,4 +1,4 @@ -import setupCoverage from '@cypress/code-coverage/task'; +import setupCoverage from '@cypress/code-coverage/task.js'; import { defineConfig } from 'cypress'; export default defineConfig({ diff --git a/eslint.config.js b/eslint.config.js index 96711bbc6..ec6061b11 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -23,6 +23,7 @@ export default [ { ignores: [ 'node_modules/*', + 'storybook-static/*', 'public/*', 'dist/*', 'build', diff --git a/package.json b/package.json index aa8edbe6b..f69404e30 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,10 @@ "Basile Spaenlehauer" ], "engines": { - "node": ">=20" + "node": ">=22" }, "type": "module", "dependencies": { - "@5.4.6": "link:@graasp/@5.4.6", "@emotion/cache": "11.14.0", "@emotion/react": "11.14.0", "@emotion/styled": "11.14.0", @@ -96,7 +95,6 @@ ] }, "devDependencies": { - "@chromatic-com/storybook": "^3.2.2", "@commitlint/cli": "19.6.0", "@commitlint/config-conventional": "19.6.0", "@cypress/code-coverage": "3.13.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 34effe5f0..4ede67de5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,9 +8,6 @@ importers: .: dependencies: - '@5.4.6': - specifier: link:@graasp/@5.4.6 - version: link:@graasp/@5.4.6 '@emotion/cache': specifier: 11.14.0 version: 11.14.0 @@ -132,9 +129,6 @@ importers: specifier: 3.24.1 version: 3.24.1 devDependencies: - '@chromatic-com/storybook': - specifier: ^3.2.2 - version: 3.2.2(react@18.3.1)(storybook@8.4.7(prettier@3.4.2)) '@commitlint/cli': specifier: 19.6.0 version: 19.6.0(@types/node@22.9.0)(typescript@5.7.2) @@ -900,12 +894,6 @@ packages: '@bundled-es-modules/tough-cookie@0.1.6': resolution: {integrity: sha512-dvMHbL464C0zI+Yqxbz6kZ5TOEp7GLW+pry/RWndAR8MJQAXZ2rPmIs8tziTZjeIyhSNZgZbCePtfSbdWqStJw==} - '@chromatic-com/storybook@3.2.2': - resolution: {integrity: sha512-xmXt/GW0hAPbzNTrxYuVo43Adrtjue4DeVrsoIIEeJdGaPNNeNf+DHMlJKOBdlHmCnFUoe9R/0mLM9zUp5bKWw==} - engines: {node: '>=16.0.0', yarn: '>=1.22.18'} - peerDependencies: - storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 - '@colors/colors@1.5.0': resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} engines: {node: '>=0.1.90'} @@ -2719,10 +2707,6 @@ packages: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} - ansi-regex@6.1.0: - resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==} - engines: {node: '>=12'} - ansi-styles@4.3.0: resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} engines: {node: '>=8'} @@ -3026,18 +3010,6 @@ packages: resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} engines: {node: '>= 8.10.0'} - chromatic@11.20.0: - resolution: {integrity: sha512-Btdli1qoAI01UKmk3Iqe6vKhAhePRXqNI/2uKKy2R16q7SN/5kLTqhd1JI20LFOZSnH3xSJaUXeJ2xZOJB//3A==} - hasBin: true - peerDependencies: - '@chromatic-com/cypress': ^0.*.* || ^1.0.0 - '@chromatic-com/playwright': ^0.*.* || ^1.0.0 - peerDependenciesMeta: - '@chromatic-com/cypress': - optional: true - '@chromatic-com/playwright': - optional: true - chrome-trace-event@1.0.4: resolution: {integrity: sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==} engines: {node: '>=6.0'} @@ -5117,12 +5089,6 @@ packages: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-confetti@6.1.0: - resolution: {integrity: sha512-7Ypx4vz0+g8ECVxr88W9zhcQpbeujJAVqL14ZnXJ3I23mOI9/oBVTQ3dkJhUmB0D6XOtCZEM6N0Gm9PMngkORw==} - engines: {node: '>=10.18'} - peerDependencies: - react: ^16.3.0 || ^17.0.1 || ^18.0.0 - react-cookie-consent@9.0.0: resolution: {integrity: sha512-Blyj+m+Zz7SFHYqT18p16EANgnSg2sIyU6Yp3vk83AnOnSW7qnehPkUe4+8+qxztJrNmCH5GP+VHsWzAKVOoZA==} engines: {node: '>=10'} @@ -5610,10 +5576,6 @@ packages: resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} engines: {node: '>=8'} - strip-ansi@7.1.0: - resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} - engines: {node: '>=12'} - strip-bom@3.0.0: resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} engines: {node: '>=4'} @@ -5813,9 +5775,6 @@ packages: tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} - tween-functions@1.2.0: - resolution: {integrity: sha512-PZBtLYcCLtEcjL14Fzb1gSxPBeL7nWvGhO5ZFPGqziCcr8uvHp0NDmdjBchp6KHL+tExcg0m3NISmKxhU394dA==} - tweetnacl@0.14.5: resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==} @@ -7064,19 +7023,6 @@ snapshots: '@types/tough-cookie': 4.0.5 tough-cookie: 4.1.4 - '@chromatic-com/storybook@3.2.2(react@18.3.1)(storybook@8.4.7(prettier@3.4.2))': - dependencies: - chromatic: 11.20.0 - filesize: 10.1.6 - jsonfile: 6.1.0 - react-confetti: 6.1.0(react@18.3.1) - storybook: 8.4.7(prettier@3.4.2) - strip-ansi: 7.1.0 - transitivePeerDependencies: - - '@chromatic-com/cypress' - - '@chromatic-com/playwright' - - react - '@colors/colors@1.5.0': optional: true @@ -9032,8 +8978,6 @@ snapshots: ansi-regex@5.0.1: {} - ansi-regex@6.1.0: {} - ansi-styles@4.3.0: dependencies: color-convert: 2.0.1 @@ -9375,8 +9319,6 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - chromatic@11.20.0: {} - chrome-trace-event@1.0.4: {} ci-info@4.1.0: {} @@ -11964,11 +11906,6 @@ snapshots: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - react-confetti@6.1.0(react@18.3.1): - dependencies: - react: 18.3.1 - tween-functions: 1.2.0 - react-cookie-consent@9.0.0(react@18.3.1): dependencies: js-cookie: 2.2.1 @@ -12555,10 +12492,6 @@ snapshots: dependencies: ansi-regex: 5.0.1 - strip-ansi@7.1.0: - dependencies: - ansi-regex: 6.1.0 - strip-bom@3.0.0: {} strip-bom@4.0.0: {} @@ -12726,8 +12659,6 @@ snapshots: dependencies: safe-buffer: 5.2.1 - tween-functions@1.2.0: {} - tweetnacl@0.14.5: {} type-check@0.4.0: