From 5885aa80c7da6995a6899967cd82a0bb888ec1d8 Mon Sep 17 00:00:00 2001 From: abose Date: Thu, 10 Apr 2025 11:21:08 +0530 Subject: [PATCH 1/2] chore: remove non pg13 explore project file --- .../explore/out_on_a_limb.html | 319 ------------------ 1 file changed, 319 deletions(-) delete mode 100644 src/assets/sample-projects/explore/out_on_a_limb.html diff --git a/src/assets/sample-projects/explore/out_on_a_limb.html b/src/assets/sample-projects/explore/out_on_a_limb.html deleted file mode 100644 index dcd1874a4f..0000000000 --- a/src/assets/sample-projects/explore/out_on_a_limb.html +++ /dev/null @@ -1,319 +0,0 @@ - - - - - Out On A Limb - - - -
- -
- - \ No newline at end of file From e9eeffe800dffce1be4ff94837a4bd9e75bcf0b8 Mon Sep 17 00:00:00 2001 From: abose Date: Fri, 11 Apr 2025 16:28:51 +0530 Subject: [PATCH 2/2] fix: github actions windows desktop tests fails after rust update, locked rust to 1.85.1 --- .github/workflows/desktop-linux-prod-test-pull.yml | 2 ++ .github/workflows/desktop-linux-test-pull.yml | 2 ++ .github/workflows/desktop-mac-m1-test-pull.yml | 2 ++ .github/workflows/desktop-mac-test-pull.yml | 2 ++ .github/workflows/desktop-windows-test-pull.yml | 2 ++ src/extensions/default/Git/src/ErrorHandler.js | 3 ++- 6 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/desktop-linux-prod-test-pull.yml b/.github/workflows/desktop-linux-prod-test-pull.yml index b18755b96c..57e41d7e3f 100644 --- a/.github/workflows/desktop-linux-prod-test-pull.yml +++ b/.github/workflows/desktop-linux-prod-test-pull.yml @@ -20,6 +20,8 @@ jobs: node-version: 20 - name: install Rust stable uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.85.1 - name: install dependencies (ubuntu only) run: | diff --git a/.github/workflows/desktop-linux-test-pull.yml b/.github/workflows/desktop-linux-test-pull.yml index 4e7efdb888..ac734955cf 100644 --- a/.github/workflows/desktop-linux-test-pull.yml +++ b/.github/workflows/desktop-linux-test-pull.yml @@ -19,6 +19,8 @@ jobs: node-version: 20 - name: install Rust stable uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.85.1 - name: install dependencies (ubuntu only) run: | diff --git a/.github/workflows/desktop-mac-m1-test-pull.yml b/.github/workflows/desktop-mac-m1-test-pull.yml index 5ae0ea9f87..15993c36d8 100644 --- a/.github/workflows/desktop-mac-m1-test-pull.yml +++ b/.github/workflows/desktop-mac-m1-test-pull.yml @@ -19,6 +19,8 @@ jobs: node-version: 20 - name: install Rust stable uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.85.1 - name: build phoenix dist-test run: | diff --git a/.github/workflows/desktop-mac-test-pull.yml b/.github/workflows/desktop-mac-test-pull.yml index ae9a92c5c7..a4b3fc8bc1 100644 --- a/.github/workflows/desktop-mac-test-pull.yml +++ b/.github/workflows/desktop-mac-test-pull.yml @@ -19,6 +19,8 @@ jobs: node-version: 20 - name: install Rust stable uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.85.1 - name: build phoenix dist-test run: | diff --git a/.github/workflows/desktop-windows-test-pull.yml b/.github/workflows/desktop-windows-test-pull.yml index aa02987ecd..504c101f08 100644 --- a/.github/workflows/desktop-windows-test-pull.yml +++ b/.github/workflows/desktop-windows-test-pull.yml @@ -19,6 +19,8 @@ jobs: node-version: 20 - name: install Rust stable uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.85.1 - name: build phoenix dist-test run: | diff --git a/src/extensions/default/Git/src/ErrorHandler.js b/src/extensions/default/Git/src/ErrorHandler.js index 9378171b17..c275cafc9b 100644 --- a/src/extensions/default/Git/src/ErrorHandler.js +++ b/src/extensions/default/Git/src/ErrorHandler.js @@ -46,7 +46,6 @@ define(function (require, exports) { exports.showError = function (err, title, options = {}) { const dontStripError = options.dontStripError; const errorMetric = options.errorMetric; - Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'dialogErr', errorMetric || "Show"); if (err.__shown) { return err; } exports.logError(err); @@ -71,6 +70,7 @@ define(function (require, exports) { errorBody = window.debugMode ? `${errorBody}\n${errorStack}` : errorBody; if(options.useNotification){ + Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'notifyErr', errorMetric || "Show"); NotificationUI.createToastFromTemplate(title, ``, { toastStyle: NotificationUI.NOTIFICATION_STYLES_CSS_CLASS.ERROR, @@ -78,6 +78,7 @@ define(function (require, exports) { instantOpen: true }); } else { + Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'dialogErr', errorMetric || "Show"); const compiledTemplate = Mustache.render(errorDialogTemplate, { title: title, body: errorBody,