From 0049b1d7128f34ffe80966b2f499388c8bb50bd0 Mon Sep 17 00:00:00 2001 From: Tony Brix Date: Fri, 20 Nov 2020 15:08:20 -0600 Subject: [PATCH 1/3] use github actions --- .github/workflows/CI.yml | 52 ++++++++++++++++++++++++++++++++++++++++ package.json | 4 ++++ 2 files changed, 56 insertions(+) create mode 100644 .github/workflows/CI.yml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml new file mode 100644 index 00000000..0ec43eab --- /dev/null +++ b/.github/workflows/CI.yml @@ -0,0 +1,52 @@ +name: "CI" +on: + pull_request: + push: + branches: + - master + +env: + CI: true + +jobs: + Test: + if: "!contains(github.event.head_commit.message, '[skip ci]')" + strategy: + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + channel: [stable, beta] + fail-fast: false + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v1 + - uses: UziTech/action-setup-atom@v1 + with: + channel: ${{ matrix.channel }} + - name: Atom version + run: atom -v + - name: APM version + run: apm -v + - name: Install dependencies + run: apm ci + - name: Run tests 👩🏾‍💻 + run: atom --test spec + + Lint: + if: "!contains(github.event.head_commit.message, '[skip ci]')" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-node@v1 + with: + node-version: '12.x' + - name: NPM install + run: npm ci + - name: Lint ✨ + run: npm run lint + + Skip: + if: contains(github.event.head_commit.message, '[skip ci]') + runs-on: ubuntu-latest + steps: + - name: Skip CI 🚫 + run: echo skip ci diff --git a/package.json b/package.json index 62ca8ee8..54264f10 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,10 @@ "keywords": [ "tree-sitter" ], + "scripts": { + "test": "atom --test spec", + "lint": "coffeelint ." + }, "devDependencies": { "coffeelint": "^1.10.1" }, From a4bf1e62d1fafb5c90c0738cd2c4eabba29003ae Mon Sep 17 00:00:00 2001 From: Tony Brix Date: Fri, 20 Nov 2020 15:10:37 -0600 Subject: [PATCH 2/3] remove .travis.yml and appveyor.yml --- .travis.yml | 41 ----------------------------------------- appveyor.yml | 29 ----------------------------- 2 files changed, 70 deletions(-) delete mode 100644 .travis.yml delete mode 100644 appveyor.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 47ee9a1a..00000000 --- a/.travis.yml +++ /dev/null @@ -1,41 +0,0 @@ -### Project specific config ### -language: generic - -env: - global: - - APM_TEST_PACKAGES="" - - ATOM_LINT_WITH_BUNDLED_NODE="true" - - matrix: - - ATOM_CHANNEL=stable - - ATOM_CHANNEL=beta - -### Generic setup follows ### -script: - - curl -s -O https://raw.githubusercontent.com/atom/ci/master/build-package.sh - - chmod u+x build-package.sh - - ./build-package.sh - -notifications: - email: - on_success: never - on_failure: change - -branches: - only: - - master - -git: - depth: 10 - -sudo: false - -dist: trusty - -addons: - apt: - packages: - - build-essential - - fakeroot - - git - - libsecret-1-dev diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 7d07d05d..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,29 +0,0 @@ -version: "{build}" - -image: Visual Studio 2015 - -platform: x64 - -branches: - only: - - master - -clone_depth: 10 - -skip_tags: true - -environment: - APM_TEST_PACKAGES: - - matrix: - - ATOM_CHANNEL: stable - - ATOM_CHANNEL: beta - -install: - - ps: Install-Product node 4 - -build_script: - - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/atom/ci/master/build-package.ps1')) - -test: off -deploy: off From c690e2324ccea078be9064ee7fbdcd43a8e54b48 Mon Sep 17 00:00:00 2001 From: Tony Brix Date: Fri, 20 Nov 2020 15:13:37 -0600 Subject: [PATCH 3/3] update readme badges --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 42d9ef46..16c28251 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # JavaScript language support in Atom -[![macOS Build Status](https://travis-ci.org/atom/language-javascript.svg?branch=master)](https://travis-ci.org/atom/language-javascript) -[![Windows Build Status](https://ci.appveyor.com/api/projects/status/ktooccwna96ssiyr/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/language-javascript-dijf8/branch/master) +[![Actions Status](https://github.com/atom/language-javascript/workflows/CI/badge.svg)](https://github.com/atom/language-javascript/actions) [![Dependency Status](https://david-dm.org/atom/language-javascript.svg)](https://david-dm.org/atom/language-javascript) Adds syntax highlighting and snippets for JavaScript in Atom.