Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitHub 0.36.5 to dev (my local copy of the upstream PR for CI debugging purposes) #7

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

GitHub 0.36.5 to dev (my local copy of the upstream PR for CI debugging purposes) #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e082977
:arrow_up: github
smashwilson Dec 4, 2020
7dbc46c
:arrow_up: github
smashwilson Dec 7, 2020
52874ee
Remove "Error Downloading Update" clause
smashwilson Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 38 additions & 23 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"fuzzy-finder": "https://www.atom.io/api/packages/fuzzy-finder/versions/1.14.3/tarball",
"git-diff": "file:packages/git-diff",
"git-utils": "5.6.2",
"github": "https://www.atom.io/api/packages/github/versions/0.36.3/tarball",
"github": "https://www.atom.io/api/packages/github/versions/0.36.6/tarball",
"glob": "^7.1.1",
"go-to-line": "file:packages/go-to-line",
"grammar-selector": "file:packages/grammar-selector",
Expand Down Expand Up @@ -203,7 +203,7 @@
"exception-reporting": "file:./packages/exception-reporting",
"find-and-replace": "0.219.7",
"fuzzy-finder": "1.14.3",
"github": "0.36.3",
"github": "0.36.6",
"git-diff": "file:./packages/git-diff",
"go-to-line": "file:./packages/go-to-line",
"grammar-selector": "file:./packages/grammar-selector",
Expand Down
5 changes: 1 addition & 4 deletions script/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,7 @@ function isTimedOut(stderrOutput) {
if (stderrOutput) {
return (
stderrOutput.includes('timeout: timed out after') || // happens in core renderer tests
stderrOutput.includes('Error: timeout of') || // happens in core main tests
stderrOutput.includes(
'Error Downloading Update: Could not get code signature for running application'
) // happens in github tests
stderrOutput.includes('Error: timeout of') // happens in core main tests
);
} else {
return false;
Expand Down