Skip to content

Commit e9eeffe

Browse files
committed
fix: github actions windows desktop tests fails after rust update, locked rust to 1.85.1
1 parent 5885aa8 commit e9eeffe

File tree

6 files changed

+12
-1
lines changed

6 files changed

+12
-1
lines changed

.github/workflows/desktop-linux-prod-test-pull.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ jobs:
2020
node-version: 20
2121
- name: install Rust stable
2222
uses: dtolnay/rust-toolchain@stable
23+
with:
24+
toolchain: 1.85.1
2325

2426
- name: install dependencies (ubuntu only)
2527
run: |

.github/workflows/desktop-linux-test-pull.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
node-version: 20
2020
- name: install Rust stable
2121
uses: dtolnay/rust-toolchain@stable
22+
with:
23+
toolchain: 1.85.1
2224

2325
- name: install dependencies (ubuntu only)
2426
run: |

.github/workflows/desktop-mac-m1-test-pull.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
node-version: 20
2020
- name: install Rust stable
2121
uses: dtolnay/rust-toolchain@stable
22+
with:
23+
toolchain: 1.85.1
2224

2325
- name: build phoenix dist-test
2426
run: |

.github/workflows/desktop-mac-test-pull.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
node-version: 20
2020
- name: install Rust stable
2121
uses: dtolnay/rust-toolchain@stable
22+
with:
23+
toolchain: 1.85.1
2224

2325
- name: build phoenix dist-test
2426
run: |

.github/workflows/desktop-windows-test-pull.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
node-version: 20
2020
- name: install Rust stable
2121
uses: dtolnay/rust-toolchain@stable
22+
with:
23+
toolchain: 1.85.1
2224

2325
- name: build phoenix dist-test
2426
run: |

src/extensions/default/Git/src/ErrorHandler.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ define(function (require, exports) {
4646
exports.showError = function (err, title, options = {}) {
4747
const dontStripError = options.dontStripError;
4848
const errorMetric = options.errorMetric;
49-
Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'dialogErr', errorMetric || "Show");
5049
if (err.__shown) { return err; }
5150

5251
exports.logError(err);
@@ -71,13 +70,15 @@ define(function (require, exports) {
7170
errorBody = window.debugMode ? `${errorBody}\n${errorStack}` : errorBody;
7271

7372
if(options.useNotification){
73+
Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'notifyErr', errorMetric || "Show");
7474
NotificationUI.createToastFromTemplate(title,
7575
`<textarea readonly style="width: 200px; height: 200px; cursor: text; resize: none;">${errorBody}</textarea>`, {
7676
toastStyle: NotificationUI.NOTIFICATION_STYLES_CSS_CLASS.ERROR,
7777
dismissOnClick: false,
7878
instantOpen: true
7979
});
8080
} else {
81+
Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'dialogErr', errorMetric || "Show");
8182
const compiledTemplate = Mustache.render(errorDialogTemplate, {
8283
title: title,
8384
body: errorBody,

0 commit comments

Comments
 (0)