Skip to content

[Tech] Merge Beta Branch in Main #1811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Sep 13, 2022
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
public/start-react.js
i18next-parser.config.js
flatpak/build/
flatpak/.flatpak-builder/
vite.config.ts
**/__tests__/**
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"ecmaVersion": 12,
"sourceType": "module",
"project": ["./tsconfig.json", "./electron/tsconfig.json"]
"project": ["./tsconfig.json"]
},
"plugins": ["react", "@typescript-eslint"],
"settings": {
Expand All @@ -27,6 +27,7 @@
}
},
"rules": {
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/no-explicit-any": "error",
"@typescript-eslint/no-unused-vars": "error",
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/build-prs-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ jobs:
run: yarn
- name: Build artifacts.
run: yarn dist:linux appimage --publish=never
env:
GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
- name: Upload AppImage.
uses: actions/upload-artifact@v2
with:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/build-prs-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ jobs:
run: yarn
- name: Build artifacts.
run: yarn dist:mac --publish=never
env:
GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
- name: Upload DMG.
uses: actions/upload-artifact@v2
with:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/build-prs-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ jobs:
run: npm i --legacy-peer-deps
- name: Build artifacts.
run: npm run dist:win portable
env:
GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
- name: Upload EXE.
uses: actions/upload-artifact@v2
with:
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/codecheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Code check

on:
pull_request:
branches: [main, beta]
workflow_dispatch:

jobs:
codecheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '16'
- name: Install modules.
run: yarn
- name: Check Typescript syntax
run: yarn codecheck
1 change: 1 addition & 0 deletions .github/workflows/draft-release-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ jobs:
- run: npm run release:linux
env:
GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
1 change: 1 addition & 0 deletions .github/workflows/draft-release-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ jobs:
- run: npm run release:mac
env:
GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,6 @@ downloads*.json

flatpak/build
.flatpak-builder

vite-plugin-electron.log
.tool-versions
2 changes: 1 addition & 1 deletion .husky/pre-push
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
yarn lint && yarn prettier-fix && yarn i18n
yarn codecheck && yarn lint && yarn prettier-fix && yarn i18n
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ node_modules
dist
build
coverage
public/index.html
public/locales/
flatpak
2 changes: 0 additions & 2 deletions Procfile

This file was deleted.

Loading