From 43644694d72b56f6dc68062c75fff27fb5ab95c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Carden=CC=83a?= <35935591+luisecm@users.noreply.github.com> Date: Tue, 21 May 2024 19:30:38 -0600 Subject: [PATCH 01/12] chore(ci): generate wasm package before launch server --- .github/workflows/automated-tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index 153b4677..3f141a81 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -50,6 +50,10 @@ jobs: if: steps.cache-test.outputs.cache-hit != 'true' run: npm ci + - name: Generate Wasm Package + working-directory: warp-wasm + run: sh generate_wasm_pkg.sh + - name: Run server run: npm run dev & From 0fc5dfe1c5a91dc69ca24a0f6944759e1486a3f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Carden=CC=83a?= <35935591+luisecm@users.noreply.github.com> Date: Tue, 21 May 2024 19:35:47 -0600 Subject: [PATCH 02/12] chore(cypress): list files --- .github/workflows/automated-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index 3f141a81..5e29adbd 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -52,7 +52,8 @@ jobs: - name: Generate Wasm Package working-directory: warp-wasm - run: sh generate_wasm_pkg.sh + run: | + ls -la - name: Run server run: npm run dev & From c45732069d8e560bf1a1146e6cc24b7bd73d032c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Carden=CC=83a?= <35935591+luisecm@users.noreply.github.com> Date: Wed, 22 May 2024 11:09:19 -0600 Subject: [PATCH 03/12] chore(workflows): init submodules recursively --- .github/workflows/automated-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index 5e29adbd..8fd8cfa1 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v4 with: repository: Satellite-im/UplinkWeb - submodules: "true" + submodules: "recursive" - name: Checkout Automated Tests directory 🔖 uses: actions/checkout@v4 From a4586bdcd3be79508ca2e3d09160569a2e9fae95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Carden=CC=83a?= <35935591+luisecm@users.noreply.github.com> Date: Wed, 22 May 2024 11:12:43 -0600 Subject: [PATCH 04/12] chore(workflow): show files recursively --- .github/workflows/automated-tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index 8fd8cfa1..60c2f467 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -51,9 +51,8 @@ jobs: run: npm ci - name: Generate Wasm Package - working-directory: warp-wasm run: | - ls -la + ls -R -la - name: Run server run: npm run dev & From 49e059efdefbd46a7be6c8bd2ff9c3de615fc6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Carden=CC=83a?= <35935591+luisecm@users.noreply.github.com> Date: Wed, 22 May 2024 11:16:23 -0600 Subject: [PATCH 05/12] chore(ci): install manually submodules --- .github/workflows/automated-tests.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index 60c2f467..2e2ded9a 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -23,7 +23,6 @@ jobs: uses: actions/checkout@v4 with: repository: Satellite-im/UplinkWeb - submodules: "recursive" - name: Checkout Automated Tests directory 🔖 uses: actions/checkout@v4 @@ -50,9 +49,12 @@ jobs: if: steps.cache-test.outputs.cache-hit != 'true' run: npm ci - - name: Generate Wasm Package - run: | - ls -R -la + - name: Init submodules + run: git submodule update --init --recursive --remote + + - name: Generate Warp Wasm Package + working-directory: ./warp-wasm + run: sh generate_wasm_pkg.sh - name: Run server run: npm run dev & From a42b1c34df2b249c17a73902ef227f1a9092d9c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Carden=CC=83a?= <35935591+luisecm@users.noreply.github.com> Date: Wed, 22 May 2024 11:27:56 -0600 Subject: [PATCH 06/12] chore(ci): fix action --- .github/workflows/automated-tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index 2e2ded9a..b72ac553 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -53,8 +53,7 @@ jobs: run: git submodule update --init --recursive --remote - name: Generate Warp Wasm Package - working-directory: ./warp-wasm - run: sh generate_wasm_pkg.sh + run: sh ./warp-wasm/generate_wasm_pkg.sh - name: Run server run: npm run dev & From adda4362e4501cd97fb5b3b7925802110b8383f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Carden=CC=83a?= <35935591+luisecm@users.noreply.github.com> Date: Wed, 22 May 2024 11:49:24 -0600 Subject: [PATCH 07/12] chore(workflow): use working directory --- .github/workflows/automated-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index b72ac553..eb3abceb 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -53,7 +53,8 @@ jobs: run: git submodule update --init --recursive --remote - name: Generate Warp Wasm Package - run: sh ./warp-wasm/generate_wasm_pkg.sh + working-directory: warp-wasm + run: sh generate_wasm_pkg.sh - name: Run server run: npm run dev & From 1178449b648e92e8dffc9cf5c37943c4c3cb47f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Carden=CC=83a?= <35935591+luisecm@users.noreply.github.com> Date: Wed, 22 May 2024 12:06:14 -0600 Subject: [PATCH 08/12] chore(workflows): remove submodules --- .github/workflows/automated-tests.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index eb3abceb..ca68a2ee 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -49,13 +49,6 @@ jobs: if: steps.cache-test.outputs.cache-hit != 'true' run: npm ci - - name: Init submodules - run: git submodule update --init --recursive --remote - - - name: Generate Warp Wasm Package - working-directory: warp-wasm - run: sh generate_wasm_pkg.sh - - name: Run server run: npm run dev & From 8be25ed5598c224b56bf991cdbcbbd2fb7b0d6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Carden=CC=83a?= <35935591+luisecm@users.noreply.github.com> Date: Wed, 22 May 2024 15:20:21 -0600 Subject: [PATCH 09/12] chore(ci): checkout warp wasm --- .github/workflows/automated-tests.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index ca68a2ee..487eddbf 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -24,6 +24,12 @@ jobs: with: repository: Satellite-im/UplinkWeb + - name: Checkout Warp Wasm package + uses: actions/checkout@v4 + with: + repository: Satellite-im/warp-wasm + path: warp-wasm + - name: Checkout Automated Tests directory 🔖 uses: actions/checkout@v4 with: @@ -49,6 +55,10 @@ jobs: if: steps.cache-test.outputs.cache-hit != 'true' run: npm ci + - name: Install Warp Wasm Package + working-directory: warp-wasm + run: sh generate_wasm_pkg.sh + - name: Run server run: npm run dev & From c1cb39b68c195ec358151500871ae107575b2cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Carden=CC=83a?= <35935591+luisecm@users.noreply.github.com> Date: Wed, 22 May 2024 15:32:28 -0600 Subject: [PATCH 10/12] chore(ci): tests --- .github/workflows/automated-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index 487eddbf..f92f2348 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -58,6 +58,9 @@ jobs: - name: Install Warp Wasm Package working-directory: warp-wasm run: sh generate_wasm_pkg.sh + env: + GH_PAT: ${{ secrets.GH_PAT }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}} - name: Run server run: npm run dev & From 89934b8abe27eabd3f67d0065e9edd5d0921fa6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Carden=CC=83a?= <35935591+luisecm@users.noreply.github.com> Date: Wed, 22 May 2024 17:17:23 -0600 Subject: [PATCH 11/12] chore(cypress): fix ci --- .github/workflows/automated-tests.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index f92f2348..8d0a68ce 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -24,12 +24,6 @@ jobs: with: repository: Satellite-im/UplinkWeb - - name: Checkout Warp Wasm package - uses: actions/checkout@v4 - with: - repository: Satellite-im/warp-wasm - path: warp-wasm - - name: Checkout Automated Tests directory 🔖 uses: actions/checkout@v4 with: @@ -53,14 +47,7 @@ jobs: - name: Install NPM dependencies for Uplink Web 📦 if: steps.cache-test.outputs.cache-hit != 'true' - run: npm ci - - - name: Install Warp Wasm Package - working-directory: warp-wasm - run: sh generate_wasm_pkg.sh - env: - GH_PAT: ${{ secrets.GH_PAT }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}} + run: npm install - name: Run server run: npm run dev & From 265fc49c0d0ddfc0dcf8b638bb59f371d5872f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Carden=CC=83a?= <35935591+luisecm@users.noreply.github.com> Date: Wed, 22 May 2024 17:20:03 -0600 Subject: [PATCH 12/12] chore(ci): do not cache for now --- .github/workflows/automated-tests.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index 8d0a68ce..03edb0f7 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -33,20 +33,12 @@ jobs: uses: actions/setup-node@v4 with: node-version: 20 - cache: "npm" - cache-dependency-path: | - package-lock.json - automated-tests/package-lock.json - - - name: Cache NPM dependencies 🔨 - uses: actions/cache@v4 - id: cache-test - with: - path: node_modules - key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} - name: Install NPM dependencies for Uplink Web 📦 - if: steps.cache-test.outputs.cache-hit != 'true' + run: npm install + + - name: Install NPM dependencies for Testing Repo 📦 + working-directory: automated-tests run: npm install - name: Run server