From 7331f4dedb6216db4ac586e3ecdf2fc3d01eaa18 Mon Sep 17 00:00:00 2001 From: Bryce McMath Date: Thu, 9 Nov 2023 12:13:07 -0800 Subject: [PATCH 1/6] chore: upgrade node version used in action Signed-off-by: Bryce McMath --- .github/workflows/actions/setup-node/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions/setup-node/action.yml b/.github/workflows/actions/setup-node/action.yml index ae53340a..e4a6b730 100644 --- a/.github/workflows/actions/setup-node/action.yml +++ b/.github/workflows/actions/setup-node/action.yml @@ -7,7 +7,7 @@ inputs: node-version: description: Select the nodejs version to use required: false - default: "16.15.0" + default: "16.15.1" runs: using: composite From 20a2bd4d9b3f30b6307f3346e3a427ab925bfee2 Mon Sep 17 00:00:00 2001 From: Bryce McMath Date: Thu, 9 Nov 2023 16:23:16 -0800 Subject: [PATCH 2/6] chore: try node 18 Signed-off-by: Bryce McMath --- .github/workflows/actions/setup-node/action.yml | 2 +- app/package.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/actions/setup-node/action.yml b/.github/workflows/actions/setup-node/action.yml index e4a6b730..dcef554f 100644 --- a/.github/workflows/actions/setup-node/action.yml +++ b/.github/workflows/actions/setup-node/action.yml @@ -7,7 +7,7 @@ inputs: node-version: description: Select the nodejs version to use required: false - default: "16.15.1" + default: "18.18.2" runs: using: composite diff --git a/app/package.json b/app/package.json index 33dd5a51..9c644010 100644 --- a/app/package.json +++ b/app/package.json @@ -6,7 +6,7 @@ "main": "index.js", "license": "Apache-2.0", "engines": { - "node": ">=16.15.0 <18.0.0", + "node": ">=16.15.0 <19.0.0", "yarn": "^3.3.1" }, "installConfig": { diff --git a/package.json b/package.json index 4a3fc1a8..7a0908c5 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "private": true, "license": "Apache-2.0", "engines": { - "node": ">=16.15.0 <18.0.0", + "node": ">=16.15.0 <19.0.0", "yarn": "^3.3.1" }, "packageManager": "yarn@3.3.1", From e9ebf69d825a78178c69d58c15914b19d63ba1c1 Mon Sep 17 00:00:00 2001 From: Bryce McMath Date: Fri, 10 Nov 2023 13:21:51 -0800 Subject: [PATCH 3/6] chore: update node engine spec Signed-off-by: Bryce McMath --- app/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index 9c644010..862994ed 100644 --- a/app/package.json +++ b/app/package.json @@ -6,7 +6,7 @@ "main": "index.js", "license": "Apache-2.0", "engines": { - "node": ">=16.15.0 <19.0.0", + "node": ">=18.18.2 <20.0.0", "yarn": "^3.3.1" }, "installConfig": { diff --git a/package.json b/package.json index 7a0908c5..78b07b70 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "private": true, "license": "Apache-2.0", "engines": { - "node": ">=16.15.0 <19.0.0", + "node": ">=18.18.2 <20.0.0", "yarn": "^3.3.1" }, "packageManager": "yarn@3.3.1", From 7652db396199bdb73aff7ab4430f5a4a43f412c2 Mon Sep 17 00:00:00 2001 From: Bryce McMath Date: Fri, 10 Nov 2023 13:51:27 -0800 Subject: [PATCH 4/6] chore: add temp rm lines to iOS action Signed-off-by: Bryce McMath --- .github/workflows/main.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 09df2720..6a9aba68 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -108,6 +108,8 @@ jobs: - name: Install dependencies working-directory: ./ run: | + rm bifold/package.json && \ + rm bifold/yarn.lock && \ yarn install --immutable && \ git status From 795048056d5ba934615e1af489e7cb9345b4f416 Mon Sep 17 00:00:00 2001 From: Bryce McMath Date: Fri, 10 Nov 2023 14:56:48 -0800 Subject: [PATCH 5/6] chore: set python version Signed-off-by: Bryce McMath --- .github/workflows/main.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 6a9aba68..7f569a13 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -65,6 +65,10 @@ jobs: run: | git submodule update --init --recursive + - uses: actions/setup-python@v4 + with: + python-version: '3.11' + - name: Setup NodeJS uses: ./.github/workflows/actions/setup-node @@ -255,6 +259,10 @@ jobs: run: | git submodule update --init --recursive + - uses: actions/setup-python@v4 + with: + python-version: '3.11' + - name: Setup NodeJS uses: ./.github/workflows/actions/setup-node From e1f8048ecceab3c62711bb314fdb83dde1cc6d62 Mon Sep 17 00:00:00 2001 From: Bryce McMath Date: Fri, 10 Nov 2023 14:59:44 -0800 Subject: [PATCH 6/6] chore: remove rm bifold/yarn command from action Signed-off-by: Bryce McMath --- .github/workflows/main.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 7f569a13..73fae580 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -112,8 +112,6 @@ jobs: - name: Install dependencies working-directory: ./ run: | - rm bifold/package.json && \ - rm bifold/yarn.lock && \ yarn install --immutable && \ git status @@ -281,8 +279,6 @@ jobs: - name: Install dependencies working-directory: ./ run: | - rm bifold/package.json && \ - rm bifold/yarn.lock && \ yarn install --immutable && \ git status