Merge 4fa6739 into 26c39ee

.circleci/config.yml

@@ -1,92 +1,9 @@
 version: 2
-
-defaults: &defaults
-  macos:
-    xcode: "9.0"
-  steps:
-  - checkout
-  - run:
-      name: create and set the default keychain
-      command: |
-        security create-keychain -p "" temporary
-        security default-keychain -s temporary
-  - run:
-      name: download build-package.sh
-      command: curl -s -O https://raw.githubusercontent.com/atom/ci/master/build-package.sh
-  - run:
-      name: chmod build-package.sh
-      command: chmod u+x build-package.sh
-  - run:
-      name: tests
-      command: caffeinate -s ./build-package.sh
-  - store_test_results:
-      path: test-results
-  - store_artifacts:
-      path: test-results
-
 jobs:
-  stable:
-    <<: *defaults
-    environment:
-    - ATOM_LINT_WITH_BUNDLED_NODE: "true"
-    - APM_TEST_PACKAGES: ""
-    - npm_config_clang: "1"
-    - CC: clang
-    - CXX: clang++
-    - ATOM_GITHUB_FS_EVENT_LOG: "1"
-    - MOCHA_TIMEOUT: "60000"
-    - UNTIL_TIMEOUT: "30000"
-    - CIRCLE_BUILD_IMAGE: osx
-    - ATOM_CHANNEL: stable
-    - TEST_JUNIT_XML_PATH: test-results/mocha/test-results.xml
-  beta:
-    <<: *defaults
-    environment:
-    - ATOM_LINT_WITH_BUNDLED_NODE: "true"
-    - APM_TEST_PACKAGES: ""
-    - npm_config_clang: "1"
-    - CC: clang
-    - CXX: clang++
-    - ATOM_GITHUB_FS_EVENT_LOG: "1"
-    - MOCHA_TIMEOUT: "60000"
-    - UNTIL_TIMEOUT: "30000"
-    - CIRCLE_BUILD_IMAGE: osx
-    - ATOM_CHANNEL: beta
-    - TEST_JUNIT_XML_PATH: test-results/mocha/test-results.xml
-  dev:
-    <<: *defaults
-    environment:
-    - ATOM_LINT_WITH_BUNDLED_NODE: "true"
-    - APM_TEST_PACKAGES: ""
-    - npm_config_clang: "1"
-    - CC: clang
-    - CXX: clang++
-    - ATOM_GITHUB_FS_EVENT_LOG: "1"
-    - MOCHA_TIMEOUT: "60000"
-    - UNTIL_TIMEOUT: "30000"
-    - CIRCLE_BUILD_IMAGE: osx
-    - ATOM_CHANNEL: dev
-    - TEST_JUNIT_XML_PATH: test-results/mocha/test-results.xml
-
-  snapshot:
-    <<: *defaults
-    environment:
-    - ATOM_LINT_WITH_BUNDLED_NODE: "true"
-    - APM_TEST_PACKAGES: ""
-    - npm_config_clang: "1"
-    - CC: clang
-    - CXX: clang++
-    - MOCHA_TIMEOUT: "60000"
-    - UNTIL_TIMEOUT: "30000"
-    - CIRCLE_BUILD_IMAGE: osx
-    - ATOM_CHANNEL: dev
-    - ATOM_GITHUB_TEST_SUITE: snapshot
-
-workflows:
-  version: 2
   build:
-    jobs:
-    - stable
-    - beta
-    - dev
-    - snapshot
+    docker:
+    - image: alpine:3.7
+    steps:
+    - run:
+        name: Keep CircleCI happy
+        command: echo 'yup'

.gitattributes

@@ -0,0 +1 @@
+test/fixtures/conflict-marker-examples/*.txt text eol=lf

README.md

@@ -1,10 +1,8 @@
 # Atom GitHub Package
 
-[![Greenkeeper badge](https://badges.greenkeeper.io/atom/github.svg)](https://greenkeeper.io/) [![Coverage Status](https://coveralls.io/repos/github/atom/github/badge.svg?branch=master)](https://coveralls.io/github/atom/github?branch=master)
-
-| Windows | Mac | Linux | Dependency Status |
-|---------|-----|-------|-------------------|
-| [![Build status](https://ci.appveyor.com/api/projects/status/psctk8vrva49dseb/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/github/branch/master) | [![CircleCI](https://circleci.com/gh/atom/github/tree/master.svg?style=svg)](https://circleci.com/gh/atom/github/tree/master) | [![Build Status](https://travis-ci.org/atom/github.svg?branch=master)](https://travis-ci.org/atom/github) | [![Dependency Status](https://david-dm.org/atom/github.svg)](https://david-dm.org/atom/github) |
+| Build | Code Coverage | Dependencies |
+|-------|---------------|--------------|
+| [![Build Status](https://dev.azure.com/atom-github/GitHub%20package%20for%20Atom/_apis/build/status/atom.github)](https://dev.azure.com/atom-github/GitHub%20package%20for%20Atom/_build/latest?definitionId=1) | [![Coverage Status](https://coveralls.io/repos/github/atom/github/badge.svg?branch=master)](https://coveralls.io/github/atom/github?branch=master) | [![Greenkeeper badge](https://badges.greenkeeper.io/atom/github.svg)](https://greenkeeper.io/) [![Dependency Status](https://david-dm.org/atom/github.svg)](https://david-dm.org/atom/github) |
 
 The Atom GitHub package provides Git and GitHub integration for Atom. Check out [github.atom.io](https://github.atom.io) for more information.