Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"parserOptions": {
"ecmaVersion": 2018,
"ecmaFeatures": {
"jsx": true,
"jsx": true
}
},
"settings": {
Expand All @@ -14,14 +14,14 @@
"plugins": [
"jsx-a11y"
],
"extends": ["fbjs-opensource"],
"extends": ["eslint:recommended"],
"rules": {
"linebreak-style": 0,
"no-param-reassign": 0,
"jsx-a11y/alt-text": 2,
"jsx-a11y/anchor-is-valid": 2,
"indent": ["error", 2],
"max-len": [1, 120, {tabWidth: 2, ignoreUrls: true}]
"max-len": [1, 120, { "tabWidth": 2, "ignoreUrls": true}]
},
"globals": {
"atom": true,
Expand Down Expand Up @@ -49,6 +49,6 @@
"expect": true,
"spyOn": true,
"waitsFor": true,
"sinon": true,
"sinon": true
}
}
25 changes: 14 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
env:
# See https://github.com/pulsar-edit/pulsar/pull/46 for why we set this env variable.
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

MOCHA_TIMEOUT: 60000
UNTIL_TIMEOUT: 30000

Expand All @@ -18,38 +18,42 @@ jobs:
name: Test
strategy:
matrix:
os: [ubuntu-20.04, ubuntu-latest, macos-latest, windows-2019]
os: [ubuntu-latest, macos-latest, windows-2019]
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
- name: Checkout the Latest Package Code
uses: actions/checkout@v3


- name: Install library dependencies (Linux)
if: ${{ runner.os == 'Linux' }}
run: apt-get update && apt-get install -y git python3 python3-pip make gcc g++ libsecret-1-0

- name: Setup Pulsar Editor
uses: pulsar-edit/action-pulsar-dependency@v3.2

- name: Install dependencies (Windows)
if: ${{ runner.os == 'Windows' }}
# Currently the Pulsar process starts, but unlike *nix doesn't wait for ppm to finish, probably because pulsar.cmd needs updated
# So we'll fallback to ppm (still named apm) instead
run: apm install --verbose
# So we'll fallback to ppm instead
run: ppm install --verbose

- name: Install dependencies (*nix)
if: ${{ runner.os != 'Windows' }}
run: pulsar --package install --verbose

# See https://github.com/atom/github/pull/2459#issuecomment-769487284
- name: Configure git
run: |
git config --global user.name Username
git config --global user.email username@github.com

- name: Run the headless Pulsar Tests
uses: coactions/setup-xvfb@v1.0.1
with:
#Ideally, the test folder should be renamed to spec to fall in-line with other conventions
run: pulsar --test test

lint:
name: Lint
runs-on: ubuntu-latest
Expand All @@ -62,4 +66,3 @@ jobs:
run: npm install
- name: Lint ✨
run: npm run lint

2 changes: 1 addition & 1 deletion lib/containers/comment-positioning-container.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import crypto from 'crypto';
import {CompositeDisposable} from 'event-kit';
import yubikiri from 'yubikiri';
import {translateLinesGivenDiff, diffPositionToFilePosition} from 'whats-my-line';
import {translateLinesGivenDiff, diffPositionToFilePosition} from '@pulsar-edit/whats-my-line';

import File from '../models/patch/file';
import ObserveModel from '../views/observe-model';
Expand Down
Loading
Loading