github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-11 07:05:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
36,320 Commits 140 Branches 571 Tags
fce5a8974f21300f0397c9f8427f0619045c8440
Commit Graph

36320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Rudolph
fce5a8974f Fix issue upgrading npm & use upgraded version 2019-04-18 10:59:33 -04:00
Jason Rudolph
cb3f24fc5c Use env var to specify path to npm binary 2019-04-18 09:53:40 -04:00
Jason Rudolph
680e48485a Set PATH so that Azure DevOps macOS builds use correct npm 
Before we run script/bootstrap on the macOS build, the preceding build
step installs npm 6.2.0 as the global npm version. It installs npm at
`/usr/local/bin/npm`. However, a _different_ version of npm appears
earlier in the PATH. The PATH looks like this:

```
/Users/vsts/hostedtoolcache/node/8.9.3/x64/bin:
/usr/local/lib/ruby/gems/2.6.0/bin:
/usr/local/opt/ruby/bin:
/usr/local/opt/curl/bin:
/usr/local/bin:
/usr/local/sbin:
/Users/vsts/bin:
/Users/vsts/.yarn/bin:
/usr/local/go/bin:
/Users/vsts/Library/Android/sdk/tools:
/Users/vsts/Library/Android/sdk/platform-tools:
/Users/vsts/Library/Android/sdk/ndk-bundle:
/Library/Frameworks/Mono.framework/Versions/Current/Commands:
/usr/bin:
/bin:
/usr/sbin:
/sbin:
/Users/vsts/.azcopy
```

There's an npm executable at
/Users/vsts/hostedtoolcache/node/8.9.3/x64/bin/npm.

To get the build to use the global version of npm, this commit puts
/usr/local/bin at the beginning of the PATH.
 2019-04-17 17:27:32 -04:00
Jason Rudolph
ce94241bde Configure Azure DevOps bootstrapping step to run with CI env vars 2019-04-17 12:23:05 -04:00
Jason Rudolph
4980439f0c Require npm 6+ on CI 
This change will allow us to use `npm ci` instead of `npm install` on 
CI, so that we can respect the package-lock.json file.
 2019-04-17 11:48:28 -04:00
Jason Rudolph
27ff10409f Configure AppVeyor to respect package-lock.json 
/xref https://github.com/atom/atom/issues/19148#issuecomment-482637949
 2019-04-17 11:44:36 -04:00
Max Brunsfeld
29e042a88b Allow travis builds to run on branches other than master 
Previously, the only way to get a travis build was to push to master or cut a release.
This change allows you to make a branch ending with '-test-travis' in order to
get a travis build.
 2019-04-16 12:58:09 -07:00
Max Brunsfeld
e10adac427 Revert "Merge pull request #19165 from atom/mb-upgrade-tree-sitter-to-0-14-again" 
This reverts commit ce2e2117d8, reversing
changes made to 4ce00667b5.
 2019-04-16 12:54:16 -07:00
Max Brunsfeld
ce2e2117d8 Merge pull request #19165 from atom/mb-upgrade-tree-sitter-to-0-14-again 
Update tree-sitter to v0.14.0
 2019-04-16 11:08:32 -07:00
Max Brunsfeld
b1c98000cd Make tree-sitter parsing synchronous in specs, like TextMate 2019-04-16 09:53:29 -07:00
Nathan Sobo
4ce00667b5 ⬆️ fuzzy-finder@1.13.1 to fix atom/fuzzy-finder#380 2019-04-15 14:28:49 -06:00
Max Brunsfeld
8f44daf4ee Revert "Revert "Merge pull request #19060 from atom/mb-tree-sitter-0-14"" 
This reverts commit f861d89fd3.
 2019-04-15 09:58:23 -07:00
Winston Liu
7c6b614b92 Merge pull request #19160 from sadikovi/language-java-0.31.3 
⬆️ language-java@0.31.3
 2019-04-13 15:59:57 -04:00
Ivan Sadikov
9d89f7b4ee update sha 2019-04-13 18:27:56 +02:00
Ivan Sadikov
605cfb9cc2 update to language-java 0.31.3 2019-04-13 18:04:18 +02:00
Jason Rudolph
4a29f442bb Merge pull request #19143 from atom/temp-0.9.0 
⬆️temp@0.9.0
 2019-04-12 10:05:14 -04:00
Rafael Oleza
74308fbabb Merge pull request #19145 from atom/add-traces-to-test 
Add debug traces to failing test steps
 2019-04-12 14:00:27 +02:00
Rafael Oleza
91558332de Add debugging message specifying which step failed 2019-04-12 12:53:20 +02:00
Rafael Oleza
a7ac4a2147 Change the way exitCodes are passed from the test steps 2019-04-12 12:52:55 +02:00
Jason Rudolph
3544cceea7 ⬆️ temp@0.9.0 2019-04-11 16:13:55 -04:00
Jason Rudolph
574f424b6a ⬆️ tree-view@0.226.0 2019-04-11 16:05:57 -04:00
Rafael Oleza
3f2a702baa Merge pull request #19138 from atom/maintain-env-vars 
Calculate env vars when launching Atom from the desktop
 2019-04-11 09:30:32 -07:00
Rafael Oleza
1a1468b61f Calculate env vars when launching Atom from the desktop 2019-04-11 17:11:07 +02:00
Ash Wilson
b89fa55ab7 Merge pull request #19136 from atom/aw/open-file-regression 
"Open file" in existing window
 2019-04-10 19:00:54 -04:00
Nathan Sobo
35037eed2d ⬆️ language-go@0.47.0 2019-04-10 16:24:29 -06:00
Nathan Sobo
16a30c8c1e ⬆️ language-javascript@0.130.0 2019-04-10 16:16:30 -06:00
Nathan Sobo
25362f7996 ⬆️ language-python@0.53.0 
Should have grouped these changes with the last version of this package. 
Oops.
 2019-04-10 15:50:35 -06:00
Nathan Sobo
258a6757e1 ⬆️ language-python@0.52.0 2019-04-10 15:36:42 -06:00
Ash Wilson
ffb295d5d6 Conditionally include {window} in getLoadSettings() 2019-04-10 16:50:21 -04:00
Ash Wilson
866447934e promptForPathToOpen() uses an existing window when only files are chosen 2019-04-10 16:15:39 -04:00
Ash Wilson
03908ddfab Pass along the source window of an open-command IPC event 2019-04-10 16:09:32 -04:00
Ash Wilson
e39b12b165 Prefer a {window} explicitly provided to openPaths() 2019-04-10 16:08:59 -04:00
Rafael Oleza
a0f41e7d82 Merge pull request #19131 from atom/fix-prs-on-release-branches 
Do not sign PRs on release branches
 2019-04-10 18:22:03 +02:00
Jason Rudolph
519a58021a Bump fuzzy-finder version in package-lock.json 2019-04-10 12:18:55 -04:00
Nathan Sobo
57d00b6f09 Merge pull request #18471 from Aerijo/comment-cursor-placement 
Toggle comment cursor placement
 2019-04-10 10:10:42 -06:00
Jason Rudolph
ca5401a730 Merge pull request #19130 from atom/fuzzy-finder-1.13.0-targeting-master 
⬆️ fuzzy-finder@1.13.0
 2019-04-10 12:05:14 -04:00
Rafael Oleza
b9b87c3648 Do not sign PRs on electron branches 2019-04-10 17:02:35 +02:00
Rafael Oleza
218253d4ba Do not sign PRs on release branches 2019-04-10 16:56:17 +02:00
Rafael Oleza
b50a5701fc Merge pull request #19126 from atom/wait-on-app-tests 
Wait until the editor is ready on application test
 2019-04-10 16:27:35 +02:00
Jason Rudolph
f156941748 ⬆️ fuzzy-finder@1.13.0 2019-04-10 10:01:42 -04:00
Nathan Sobo
513a38bcea Unfocus test 🙈 2019-04-09 10:54:01 -06:00
Rafael Oleza
6b61f14c3b Wait until the editor is ready on application test 2019-04-09 16:00:47 +02:00
Rafael Oleza
d6f06f6b61 Merge pull request #19124 from atom/fix-application-test 
Fix atom-application tests
 2019-04-09 14:45:23 +02:00
Rafael Oleza
dbe00f616a Fix atom-application tests 
When closing a window with a file that does not exist, Atom opens a
dialog asking the users if they want to save the changes. This dialog
prevented the tests from finishing correctly.
 2019-04-09 13:18:02 +02:00
Hubot
de31d140cb 1.38.0-dev 2019-04-08 19:00:12 -05:00
Nathan Sobo
397d427568 Fix lint error 2019-04-08 17:16:50 -06:00
Nathan Sobo
6277cefa07 Clean up assertion style 
I prefer to express only one assertion per line rather than &&-ing 
together multiple assertions into a condition. I also prefer to use 
equality assertions so that failure messages include more information 
about the actual and expected values.

I used nested scope blocks so we could re-define the `range` constant in 
a local scope without needing to mutate a variable across unrelated 
tests.
 2019-04-08 16:57:35 -06:00
Nathan Sobo
47368136d8 Fix syntax error that caused test not to run and some problems with test 2019-04-08 16:45:34 -06:00
Nathan Sobo
218086d379 Merge branch 'master' into comment-cursor-placement 2019-04-08 16:19:25 -06:00
Nathan Sobo
24c0503617 ⬆️ settings-view@0.261.1 2019-04-08 13:51:44 -06:00