From 751933e77116ebe8fc64761879b232f28a54aa67 Mon Sep 17 00:00:00 2001 From: kremnev8 Date: Fri, 15 Oct 2021 17:31:21 +0300 Subject: [PATCH 1/3] Update node.js.yml --- .github/workflows/node.js.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 52c2d8c7..ac408531 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -30,6 +30,3 @@ jobs: - run: git submodule update - run: npm ci - run: npm run build --if-present - - run: npm test - env: - TEST8BIT_GITHUB_TOKEN: ${{ secrets.TEST8BIT_GITHUB_TOKEN }} From dc8eca58ff71849f64535d99b1450a9cf30a93ba Mon Sep 17 00:00:00 2001 From: kremnev8 Date: Fri, 15 Oct 2021 21:51:54 +0300 Subject: [PATCH 2/3] Fix asset editor issues on verilog-vga platform --- src/ide/pixeleditor.ts | 2 +- src/ide/views/asseteditor.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ide/pixeleditor.ts b/src/ide/pixeleditor.ts index d8bc15dc..21e58819 100644 --- a/src/ide/pixeleditor.ts +++ b/src/ide/pixeleditor.ts @@ -1096,7 +1096,7 @@ class PixEditor extends Viewer { var yy = y + 0.5 - this.height/2.0; var xx2 = xx*c1 - yy*s1 + this.width/2.0 - 0.5; var yy2 = yy*c1 + xx*s1 + this.height/2.0 - 0.5; - return this.getPixel(xx, yy); + return this.getPixel(xx2, yy2); }); } rotate90() { diff --git a/src/ide/views/asseteditor.ts b/src/ide/views/asseteditor.ts index e212c5ea..73334e74 100644 --- a/src/ide/views/asseteditor.ts +++ b/src/ide/views/asseteditor.ts @@ -138,7 +138,7 @@ export class AssetEditorView implements ProjectView, pixed.EditorContext { var start = m.index + m[0].length; var end; // TODO: verilog end - if (platform_id == 'verilog') { + if (platform_id.includes('verilog')) { end = data.indexOf("end", start); // asm } else if (m[0].startsWith(';;')) { end = data.indexOf(';;', start); // asm From 599ced82d485ee27d83df1475807e24ceb48748d Mon Sep 17 00:00:00 2001 From: kremnev8 Date: Fri, 15 Oct 2021 21:55:04 +0300 Subject: [PATCH 3/3] Revert "Update node.js.yml" This reverts commit 751933e77116ebe8fc64761879b232f28a54aa67. --- .github/workflows/node.js.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index ac408531..52c2d8c7 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -30,3 +30,6 @@ jobs: - run: git submodule update - run: npm ci - run: npm run build --if-present + - run: npm test + env: + TEST8BIT_GITHUB_TOKEN: ${{ secrets.TEST8BIT_GITHUB_TOKEN }}