From d6c1a4c1a022777a0c4f340ee206751d6e85873a Mon Sep 17 00:00:00 2001 From: Ahmad Kadri Date: Mon, 9 Dec 2024 09:25:35 +0100 Subject: [PATCH 1/8] CI use Node version from package.json Signed-off-by: Ahmad Kadri --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 132f0a4d..e9e3c1cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '20' + node-version-file: 'package.json' cache: 'yarn' - name: yarn install @@ -104,7 +104,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '20' + node-version-file: 'package.json' cache: 'yarn' - name: yarn install @@ -200,7 +200,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '20' + node-version-file: 'package.json' cache: 'yarn' - name: yarn install @@ -237,7 +237,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '20' + node-version-file: 'package.json' cache: 'yarn' - name: yarn install From c2b3d0ac970e2e955e9e6c716fd3e5f41e299005 Mon Sep 17 00:00:00 2001 From: Ahmad Kadri Date: Mon, 9 Dec 2024 11:39:49 +0100 Subject: [PATCH 2/8] fix the path Signed-off-by: Ahmad Kadri --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9e3c1cc..3f373e8c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -237,7 +237,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version-file: 'package.json' + node-version-file: 'e2e/package.json' cache: 'yarn' - name: yarn install From 01b292e4ee2894e8dc7bb39a00b572bef77cf06d Mon Sep 17 00:00:00 2001 From: Ahmad Kadri Date: Mon, 9 Dec 2024 11:40:57 +0100 Subject: [PATCH 3/8] fix the path overall Signed-off-by: Ahmad Kadri --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f373e8c..2dec94af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version-file: 'package.json' + node-version-file: 'e2e/package.json' cache: 'yarn' - name: yarn install @@ -104,7 +104,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version-file: 'package.json' + node-version-file: 'e2e/package.json' cache: 'yarn' - name: yarn install @@ -200,7 +200,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version-file: 'package.json' + node-version-file: 'e2e/package.json' cache: 'yarn' - name: yarn install From 9f311267266f413472dea3e5c67676a4de3efb9f Mon Sep 17 00:00:00 2001 From: Ahmad Kadri Date: Mon, 9 Dec 2024 16:24:59 +0100 Subject: [PATCH 4/8] add engines to root pacakge.json Signed-off-by: Ahmad Kadri --- package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.json b/package.json index 9daad149..fdf7c15e 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,10 @@ "prettier-plugin-organize-imports": "^4.1.0", "yarn-deduplicate": "^6.0.2" }, + "engines": { + "node": ">=20", + "yarn": ">=1.22.1 <2.0.0" + }, "scripts": { "start": "yarn workspace @nordeck/matrix-meetings-widget start", "dev": "yarn workspace @nordeck/matrix-meetings-widget dev", From cdc48d16a10acaeb190f728f1310789bb72ab8d4 Mon Sep 17 00:00:00 2001 From: Ahmad Kadri Date: Mon, 9 Dec 2024 16:25:23 +0100 Subject: [PATCH 5/8] fix the path Signed-off-by: Ahmad Kadri --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2dec94af..07a03f32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version-file: 'e2e/package.json' + node-version-file: 'package.json' cache: 'yarn' - name: yarn install From 2ace198e990f22f78f116ffb11f4c3037b44baec Mon Sep 17 00:00:00 2001 From: Ahmad Kadri Date: Mon, 9 Dec 2024 18:04:54 +0100 Subject: [PATCH 6/8] fix the path in all places Signed-off-by: Ahmad Kadri --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07a03f32..e9e3c1cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,7 +104,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version-file: 'e2e/package.json' + node-version-file: 'package.json' cache: 'yarn' - name: yarn install @@ -200,7 +200,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version-file: 'e2e/package.json' + node-version-file: 'package.json' cache: 'yarn' - name: yarn install @@ -237,7 +237,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version-file: 'e2e/package.json' + node-version-file: 'package.json' cache: 'yarn' - name: yarn install From 2621a56a436e07a97eaa841194a5ff699c615ba6 Mon Sep 17 00:00:00 2001 From: Ahmad Kadri Date: Mon, 9 Dec 2024 18:07:16 +0100 Subject: [PATCH 7/8] fix the path in all places to the right path Signed-off-by: Ahmad Kadri --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9e3c1cc..6c05313c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,7 +104,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version-file: 'package.json' + node-version-file: 'node-version/package.json' cache: 'yarn' - name: yarn install @@ -237,7 +237,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version-file: 'package.json' + node-version-file: 'e2e/package.json' cache: 'yarn' - name: yarn install From 3880b1840e97db3f0ae06a87a08d6606ba1afe5e Mon Sep 17 00:00:00 2001 From: Ahmad Kadri Date: Mon, 9 Dec 2024 19:48:12 +0100 Subject: [PATCH 8/8] fix the path Signed-off-by: Ahmad Kadri --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c05313c..e1f9d450 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,7 +104,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version-file: 'node-version/package.json' + node-version-file: 'matrix-meetings-bot/package.json' cache: 'yarn' - name: yarn install @@ -237,7 +237,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version-file: 'e2e/package.json' + node-version-file: 'package.json' cache: 'yarn' - name: yarn install