From 17bec4262e750ca3ee1e928e54708d13cc0cd8b8 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Mon, 19 Jun 2017 14:48:47 -0700 Subject: [PATCH 1/2] :arrow_up: text-buffer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a38a4bcc8..332e27e21 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "sinon": "1.17.4", "@atom/source-map-support": "^0.3.4", "temp": "^0.8.3", - "text-buffer": "13.0.3", + "text-buffer": "13.0.4", "typescript-simple": "1.0.0", "underscore-plus": "^1.6.6", "winreg": "^1.2.1", From f9c0ed0a6dbc7c0f4927547352acf818b702e146 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Mon, 19 Jun 2017 14:48:51 -0700 Subject: [PATCH 2/2] Revert "Use a more recent c++ toolchain on travis" This reverts commit 958eed3a624930d95dc5fb39b98036ce2266038b. --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9cfc4d24..71accd347 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ matrix: include: - os: linux dist: trusty - env: NODE_VERSION=6.9.4 DISPLAY=:99.0 CXX=g++-6 CC=gcc-6 + env: NODE_VERSION=6.9.4 DISPLAY=:99.0 CC=clang CXX=clang++ npm_config_clang=1 sudo: required @@ -51,11 +51,9 @@ addons: - out/atom-amd64.tar.gz target_paths: travis-artifacts/$TRAVIS_BUILD_ID apt: - sources: - - ubuntu-toolchain-r-test packages: - - gcc-6 - - g++-6 + - build-essential + - clang-3.3 - fakeroot - git - libsecret-1-dev