Skip to content
This repository has been archived by the owner on Jun 20, 2022. It is now read-only.

Commit

Permalink
Merge branch 'release/3.6.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
arielsvg committed Mar 3, 2021
2 parents fd9b619 + d5d5706 commit de6f27e
Show file tree
Hide file tree
Showing 48 changed files with 7,017 additions and 14,580 deletions.
3 changes: 0 additions & 3 deletions .env.js.sample

This file was deleted.

1 change: 1 addition & 0 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BUGSNAG_API_KEY=''
5 changes: 4 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
"eslint:recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
"semistandard",
"prettier"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": "./tsconfig.json",
"extraFileExtensions": [".mjs"]
},
"rules": {
/** Style */
"semi": 1,
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Dev

on:
push:
branches:
- develop

jobs:
build:
runs-on: ubuntu-latest
env:
BUGSNAG_API_KEY: ${{ secrets.BUGSNAG_API_KEY }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '14.x'
registry-url: 'https://registry.npmjs.org'
- uses: samuelmeuli/action-snapcraft@v1
with:
snapcraft_token: ${{ secrets.SNAPCRAFT_TOKEN }}
- run: yarn setup
- run: yarn build appimage-x64
- uses: actions/upload-artifact@v2
with:
name: 'AppImage'
path: dist/*.AppImage
26 changes: 0 additions & 26 deletions .github/workflows/lint.yml

This file was deleted.

24 changes: 24 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Dev

on:
pull_request:
branches:
- develop
- main

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '14.x'
registry-url: 'https://registry.npmjs.org'
- run: yarn setup
- name: Prettier
run: yarn lint:formatting
- name: Typescript
run: yarn lint:types
- name: ESLint
run: yarn lint:eslint
23 changes: 23 additions & 0 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Prod

on:
push:
branches:
- main

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '14.x'
registry-url: 'https://registry.npmjs.org'
- run: yarn setup
- name: Prettier
run: yarn lint:formatting
- name: Typescript
run: yarn lint:types
- name: ESLint
run: yarn lint:eslint
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ test/data/tmp/

/app/dist
.vscode
.env.js
.env
22 changes: 12 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,23 @@ This application makes use of the core JS/CSS/HTML code found in the [web repo](

## Running Locally

Make sure [Yarn](https://classic.yarnpkg.com/en/) is installed on your system.

```bash
npm run setup
npm run build:web # Or `npm run dev:web`
npm run dev
yarn setup
yarn build:web # Or `yarn dev:web`
yarn dev

# In another terminal
npm start
yarn start
```

We use [commitlint](https://github.com/conventional-changelog/commitlint) to validate commit messages.
Before making a pull request, make sure to check the output of the following commands:

```bash
npm run lint
npm test # make sure to start `npm run dev` before running the tests
yarn lint
yarn test # make sure to start `yarn dev` before running the tests
```

Pull requests should target the `develop` branch.
Expand All @@ -45,13 +47,13 @@ To determine where to install a dependency:

Build for all platforms:

- `npm run build`
- `yarn build`

or

- `npm run build:win`
- `npm run build:linux`
- `npm run build:mac`
- `yarn build:win`
- `yarn build:linux`
- `yarn build:mac`

## Installation

Expand Down
2 changes: 1 addition & 1 deletion app/extensions/batch-manager
2 changes: 1 addition & 1 deletion app/extensions/extensions-manager
78 changes: 0 additions & 78 deletions app/grantKeyringAccess.html

This file was deleted.

Loading

0 comments on commit de6f27e

Please sign in to comment.