Commit Graph

961 Commits

Author SHA1 Message Date
Nathan Sobo
cd3b2f5363 Merge pull request #11897 from atom/mkt-use-apm-with-npm3-and-node-4
Use apm@1.12.2 with Node v4 and npm v3 \o/
2016-07-25 10:32:00 -06:00
Nathan Sobo
1c3bd102ca Clarify logging when upload-assets is skipped on non-release branches 2016-07-22 16:04:53 -06:00
Nathan Sobo
24feb64a52 Log release.tag_name correctly 2016-07-22 16:01:07 -06:00
Damien Guard
6afb4da0cf Add repo logging to publish task 2016-07-22 15:13:24 -06:00
Damien Guard
c65d45ea62 Add logging to publish-build-task 2016-07-22 15:13:23 -06:00
Nathan Sobo
726cc4c077 Rename ATOM_REPO to ATOM_PUBLISH_REPO and always publish when it is set 2016-07-21 13:42:26 -06:00
Antonio Scandurra
8d33778900 Use npm 3.10.5 in build/package.json too 2016-07-20 13:02:43 +02:00
Antonio Scandurra
be134ce3c9 Revert "Disable specs (again) to allow caching"
This reverts commit b3d3b52d3d.
2016-07-20 13:01:00 +02:00
Antonio Scandurra
b3d3b52d3d Disable specs (again) to allow caching 2016-07-20 10:50:32 +02:00
Antonio Scandurra
9b4f46cab1 Add back testing to Gruntfile 2016-07-19 16:56:26 +02:00
Antonio Scandurra
207131836d Cache also .atom/.node-gyp/.atom 2016-07-19 16:04:07 +02:00
Antonio Scandurra
7a22c50403 Run tests 2016-07-18 16:51:09 +02:00
Antonio Scandurra
eb7d695e60 Don't run specs to avoid timing out the build
...this needs to be re-enabled on the next commit.
2016-07-18 16:02:27 +02:00
Antonio Scandurra
ab2ede30da Merge branch 'mb-remove-nodegit' into as-ns-use-apm-with-npm3-and-node-4
# Conflicts:
#	package.json
2016-07-14 16:49:05 +02:00
Damien Guard
90d36b4de2 Merge pull request #12037 from atom/publish-win32-assets-from-appveyor
Use in-path 7z on AppVeyor, tidy-up publish
2016-07-03 07:58:18 -07:00
Michelle Tilley
fcfbbbcddf
Merge remote-tracking branch 'origin/master' into mkt-use-apm-with-npm3-and-node-4 2016-06-28 14:38:14 -07:00
Damien Guard
341a9602b2
Use in-path 7z on AppVeyor, tidy-up publish 2016-06-27 22:34:37 -07:00
Thomas Johansen
35ceb66a5b Merge pull request #11875 from atom/sm-move-bootstrap-to-npm
Merge Bootstrap + Core styles

Closes #11839 
Closes #11858
2016-06-24 07:54:16 +02:00
Thomas Johansen
b2f7c9d52d 🔥 Remove all bootstrap remnants 2016-06-19 16:20:44 +02:00
Leonard Lamprecht
3a1ad3fd40 Replace OS X and Mac OS with macOS 2016-06-18 15:33:08 +02:00
Michelle Tilley
496539208b Only read actual package.json files from disk in compile-packages-slug task 2016-06-14 13:40:40 -07:00
Michelle Tilley
3836907ee3 ⬆️ apm@1.11.0
Signed-off-by: Katrina Uychaco <kuychaco@github.com>
2016-06-13 11:20:13 -07:00
Antonio Scandurra
5e3f343e41 Merge branch 'master' into as-main-process-test-runner 2016-05-25 11:03:10 +02:00
Antonio Scandurra
df0b3dedd7 browser -> main-process 2016-05-25 11:02:29 +02:00
Antonio Scandurra
a1a609a357 Output renderer/main processes failure message 2016-05-24 11:08:12 +02:00
Antonio Scandurra
01e8601f7f 🎨 runCoreSpecs -> runRendererProcessSpecs 2016-05-24 10:01:51 +02:00
Antonio Scandurra
75d4919489 Restore concurrency on renderer specs 2016-05-24 10:01:12 +02:00
Antonio Scandurra
62d48c64ea Add --main-process flag to run specs in the main process
…so that we can write unit tests for code in the main process. Below a
list of conventions we'll be adopting:

1. Use mocha as the test framework.
2. Use chai as the assertion library.
3. Name specs `foo-bar.spec.js`, to prevent the renderer process from
running specs written fro the main process e.g. when calling
`atom --test spec`.
4. Write specs in ES6.

Although somewhat inconsistent with the conventions we use for renderer
process specs, this will hopefully be a first step towards migrating our
entire Jasmine 1.3 test suite to a more modern environment.
2016-05-24 08:23:27 +02:00
Damien Guard
d593028707 Merge pull request #11791 from atom/dg-sign-windows-using-squirrel
Sign Windows builds with Squirrel for MSI compatibility
2016-05-23 14:22:36 -07:00
Antonio Scandurra
8f1a691b74 🔥 Duplicate tweetnacl license override 2016-05-20 09:20:23 +02:00
Lee Dohm
bc5727f4b3
Add tweetnacl@0.14.3 to license-overrides 2016-05-19 15:56:16 -07:00
Damien Guard
defbe35783 Enable Windows codesigning via Squirrel for MSI 2016-05-19 14:49:16 -07:00
Damien Guard
ce511c9bc2 Merge pull request #11761 from atom/dg-improve-install-task-windows
Windows build - handle admin elevation when required for install
2016-05-18 12:05:08 -07:00
Daniel Hengeveld
a33757c5f7 attach msi to release 2016-05-11 13:57:51 +02:00
Damien Guard
6c368af792 Handle admin elevation when path exists 2016-05-10 12:52:04 -07:00
Antonio Scandurra
02d9245c05 Merge branch 'master' into ns-switch-to-display-layers 2016-04-30 11:10:17 +02:00
Antonio Scandurra
00ebe6bbbc
Merge branch 'master' into ns-switch-to-display-layers
# Conflicts:
#	src/text-editor.coffee
2016-04-26 10:19:39 +02:00
Damien Guard
58e1953e43 Win32 build now installs to localappdata. Admin elevation now smart. 2016-04-22 12:07:19 -07:00
joshaber
866a26a754 Update the ignore paths for ohnogit. 2016-04-21 13:25:14 -04:00
Nathan Sobo
60d2160e6d Merge remote-tracking branch 'origin/master' into ns-switch-to-display-layers 2016-04-21 10:43:55 -06:00
Katrina Uychaco
eb739cd025 Add build-and-sign grunt task for codesigning Atom 2016-04-20 12:40:45 -07:00
Antonio Scandurra
7eba972f39
Merge branch 'master' into ns-switch-to-display-layers 2016-04-15 17:39:15 +02:00
Antonio Scandurra
740e371e75
Put back multi-platform specs 2016-04-14 16:05:38 +02:00
Antonio Scandurra
61d8c6852c
Remove non-Mac run-specs code and use ELECTRON_ENABLE_LOGGING=true
* Remove Windows/Linux run-specs code. There is little value in keeping those
  code paths, given that we don't run specs on those platforms; if we ever need
  it again, we can restore it from the git history.
* Use ELECTRON_ENABLE_LOGGING=true. This allows us to capture the output of
  calls to `console.warn` and `console.log`, which are useful to log out Grim
  deprecations.
* Remove `logDeprecations` in build/spec-task.coffee. This method used to format the output captured on stderr to strip out "[Console]" noise from deprecations.
  This code path was not running anymore because we started using stdio:
  'inherit' in #10838, which prevents stderr output to be captured. This doesn't
  seem a huge deal, so long as those deprecations get logged to screen.
2016-04-14 15:07:50 +02:00
Antonio Scandurra
4adf23a595
Unconditionally report deprecations on every test environment 2016-04-14 11:24:01 +02:00
Antonio Scandurra
581dd45418
Merge branch 'master' into ns-switch-to-display-layers 2016-04-13 13:54:13 +02:00
Nathan Sobo
1721938057 Use signtool from environment variable 2016-04-11 15:13:45 -06:00
Nathan Sobo
77657aca0d Fix linter error 2016-04-11 15:13:20 -06:00
Damien Guard
95adf16160 Signing support on Windows with P12 keys 2016-04-11 15:13:03 -06:00
Nathan Sobo
639ee963a0 Revert "Merge pull request #11412 from damieng/dg-ns-codesign"
This reverts commit 91b0726c9e, reversing
changes made to d6e00bb53b.
2016-04-11 14:35:47 -06:00