From ac6dccaa5e65cfb9a43f1de25b3ad1d959c43a5b Mon Sep 17 00:00:00 2001 From: raphaelcoeffic Date: Mon, 19 Aug 2024 06:22:36 +0200 Subject: [PATCH 1/3] feat: no DFU wait --- src/shared/dfu/index.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/shared/dfu/index.ts b/src/shared/dfu/index.ts index 364c378..a6a938b 100644 --- a/src/shared/dfu/index.ts +++ b/src/shared/dfu/index.ts @@ -635,9 +635,12 @@ export class WebDFU { (ignoreErrors || dfuStatus.state !== dfuCommands.dfuERROR) ) { // eslint-disable-next-line no-await-in-loop - await asyncSleep(dfuStatus.pollTimeout); - // eslint-disable-next-line no-await-in-loop - dfuStatus = await this.getStatus(); + await asyncSleep(0); + try { + // eslint-disable-next-line no-await-in-loop + dfuStatus = await this.getStatus(); + // eslint-disable-next-line no-empty + } catch (error) {} } return dfuStatus; From ff7e92e58d20178869498a644b8b60df79cbc1af Mon Sep 17 00:00:00 2001 From: raphaelcoeffic Date: Tue, 20 Aug 2024 19:42:15 +0200 Subject: [PATCH 2/3] fix: checkout before running preview-web --- .github/workflows/pipeline.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 0186728..41f3ed5 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -325,6 +325,8 @@ jobs: if: github.event_name == 'pull_request' runs-on: ubuntu-latest steps: + - uses: actions/checkout@v4 + - name: Fetch compiled source uses: actions/download-artifact@v4 with: From 3952cc3991f50b85bbd97e298f9e787eee3924c0 Mon Sep 17 00:00:00 2001 From: raphaelcoeffic Date: Tue, 20 Aug 2024 20:00:50 +0200 Subject: [PATCH 3/3] fix: e2e tests --- e2e/pages/firmware-wizard/firmware-selection.spec.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/e2e/pages/firmware-wizard/firmware-selection.spec.ts b/e2e/pages/firmware-wizard/firmware-selection.spec.ts index 07ae3b4..6f54b39 100644 --- a/e2e/pages/firmware-wizard/firmware-selection.spec.ts +++ b/e2e/pages/firmware-wizard/firmware-selection.spec.ts @@ -160,7 +160,9 @@ test("Copy URL button copies a link to the selected firmware", async ({ test.skip(browserName !== "chromium"); await (await queries.findByLabelText("Firmware version")).press("Enter"); await page - .locator(".ant-select-item-option[title='EdgeTX \"Santa\" v2.6.0']") + .locator( + ".ant-select-item-option[title='EdgeTX \"Flying Dutchman\" v2.8.5']" + ) .click(); const radioSelector = await queries.findByLabelText("Radio model"); @@ -181,9 +183,9 @@ test("Copy URL button copies a link to the selected firmware", async ({ if (isElectron) { expect(copiedUrl).toBe( - "buddy.edgetx.org/#/flash?version=v2.6.0&target=x10" + "buddy.edgetx.org/#/flash?version=v2.8.5&target=x10" ); } else { - expect(copiedUrl).toBe("localhost:8081/#/flash?version=v2.6.0&target=x10"); + expect(copiedUrl).toBe("localhost:8081/#/flash?version=v2.8.5&target=x10"); } });