Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/keyboard-shortcut
Browse files Browse the repository at this point in the history
  • Loading branch information
setchy committed Jun 17, 2024
2 parents 81ad51f + b942002 commit 7230949
Show file tree
Hide file tree
Showing 161 changed files with 21,584 additions and 8,095 deletions.
11 changes: 9 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ body:
label: Gitify Version
description: What version of Gitify are you using?
options:
- 5.9.0
- 5.8.1
- 5.8.0
- 5.7.0
- 5.6.0
- 5.5.0
- 5.4.0
- 5.3.0
- 5.2.0
- 5.1.0
Expand Down Expand Up @@ -66,8 +73,8 @@ body:
label: GitHub Account
description: What GitHub account type are you using?
options:
- GitHub.com
- GitHub Enterprise
- GitHub Cloud
- GitHub Enterprise Server
- Combination
validations:
required: true
Expand Down
29 changes: 29 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
changelog:
exclude:
labels:
- release
categories:
- title: 🚀 Features
labels:
- enhancement
- title: 🐛 Bug Fixes
labels:
- bug
- title: 🧼 Code Refactoring
labels:
- refactor
- title: 📚 Documentation
labels:
- documentation
- title: 🧪 Testing
labels:
- test
- title: 🏗️ Build System
labels:
- build
- title: 📦 Dependency Updates
labels:
- dependency
- title: Other Changes
labels:
- "*"
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
build-macos:
name: Build macOS (electron-builder)
runs-on: macos-14
runs-on: macos-latest

steps:
- uses: actions/checkout@v4
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Linting

on:
push:
branches:
- main
pull_request:

jobs:
lint:
name: biomejs
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v3
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'pnpm'
- run: pnpm install
- run: pnpm lint:check
52 changes: 0 additions & 52 deletions .github/workflows/on-tag.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ on:
push:
branches:
- 'release/v**'
workflow_dispatch: #For manually running release process to verify codesigning of artifacts
workflow_dispatch: # For manually running release process to verify codesigning of artifacts

jobs:
release-macos:
name: Publish macOS (electron-builder)
runs-on: macos-14
runs-on: macos-latest

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -86,4 +86,4 @@ jobs:
with:
name: Gitify-release-linux
path: dist/
overwrite: true
overwrite: true
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
run-unit-tests:
name: Run Tests
runs-on: ubuntu-latest
runs-on: macos-latest

steps:
- uses: actions/checkout@v4
Expand All @@ -19,7 +19,6 @@ jobs:
node-version-file: '.nvmrc'
cache: 'pnpm'
- run: pnpm install
- run: pnpm lint:check
- run: pnpm tsc --noEmit
- run: pnpm test -- --coverage --runInBand --verbose
- name: Coveralls
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ on:

jobs:
pr-lint:
name: Validate PR name
name: Validate PR title
runs-on: ubuntu-latest
steps:
- name: Validate PR title
uses: actions/github-script@v7
- uses: actions/github-script@v7
with:
script: |
const title = context.payload.pull_request.title;
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Update Website

on:
push:
tags: 'v*'
workflow_dispatch: # For manually verify

jobs:
redeploy-website:
runs-on: ubuntu-latest
steps:
- name: Redeploy Website
run: curl -X POST -d {} ${{ secrets.NETLIFY_BUILD_HOOK_URL }}

2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.12.2
20.14.0
40 changes: 20 additions & 20 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
// Use IntelliSense to learn about possible Node.js debug attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Launch Program",
"program": "${workspaceRoot}/main.js"
},
{
"type": "node",
"request": "attach",
"name": "Attach to Process",
"address": "localhost",
"port": 5858
}
]
}
// Use IntelliSense to learn about possible Node.js debug attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Launch Program",
"program": "${workspaceRoot}/main.js"
},
{
"type": "node",
"request": "attach",
"name": "Attach to Process",
"address": "localhost",
"port": 5858
}
]
}
23 changes: 17 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Gitify [![Build Workflow][build-workflow-badge]][github-actions] [![Release Workflow][release-workflow-badge]][github-actions] [![Coveralls][coveralls-badge]][coveralls] [![Contributors][contributors-badge]][github] [![Downloads - Total][downloads-total-badge]][website] [![Downloads - Latest Release][downloads-latest-badge]][website] [![OSS License][license-badge]][license] [![Latest Release][github-release-badge]][github-releases] [![Homebrew Cask][homebrew-cask-badge]][homebrew-cask]
# Gitify [![Build Workflow][build-workflow-badge]][github-actions] [![Release Workflow][release-workflow-badge]][github-actions] [![Coveralls][coveralls-badge]][coveralls] [![Renovate enabled][renovate-badge]][renovate] [![Libraries.io dependency status][librariesio-badge]][librariesio] [![Contributors][contributors-badge]][github] [![Downloads - Total][downloads-total-badge]][website] [![Downloads - Latest Release][downloads-latest-badge]][website] [![OSS License][license-badge]][license] [![Latest Release][github-release-badge]][github-releases] [![Homebrew Cask][homebrew-cask-badge]][homebrew-cask]

> GitHub Notifications on your menu bar. Available on macOS, Windows and Linux.
Expand Down Expand Up @@ -42,11 +42,13 @@ The release process is automated. Follow the steps below.
4. In the same branch, **bump the version** of the app by running `pnpm version <new-version-number`. Commit these changes and open a PR. A GitHub Actions workflow will build, sign and upload the release assets for each commit to that branch as long as a branch is named like `release/vX.X.X` and there is a draft release with the same version number(`package.json`).
5. Merge your release branch into `main`.
6. Publish the release once you've finalized the release notes and confirmed all assets are there.
7. Merge the open pull request in [gitify-app/website][github-website-pulls] (ie: `bump/v1.2.3`)
7. A new homebrew cask will be automatically published (workflow runs ~3 hours)

### Tests

There are 2 checks - one for biome (linter & formatter) and one for the unit tests with `jest`.
There are 2 checks:
1. linter & formatter with [biome][biome-website]
2. unit tests with [jest][jest-website]

```shell
# Run biome to check linting and formatting
Expand Down Expand Up @@ -75,10 +77,13 @@ Please visit our [Gitify FAQs][faqs] for all commonly asked questions.

### License

Gitify is licensed under the MIT Open Source license. For more information, see [LICENSE](LICENSE).
Gitify is licensed under the MIT Open Source license.
For more information, see [LICENSE](LICENSE).


<!-- LINK LABELS -->
[website]: https://www.gitify.io
[faqs]: https://www.gitify.io/faqs
[faqs]: https://www.gitify.io/faq/
[github]: https://github.com/gitify-app/gitify
[github-actions]: https://github.com/gitify-app/gitify/actions
[github-releases]: https://github.com/gitify-app/gitify/releases/latest
Expand All @@ -87,14 +92,20 @@ Gitify is licensed under the MIT Open Source license. For more information, see
[github-website-pulls]: https://github.com/gitify-app/website/pulls
[brew]: http://brew.sh/
[homebrew-cask]: https://formulae.brew.sh/cask/gitify
[biome-website]: biomejs.dev/
[coveralls]: https://coveralls.io/github/gitify-app/gitify
[coveralls-badge]: https://img.shields.io/coverallsCoverage/github/gitify-app/gitify
[build-workflow-badge]: https://github.com/gitify-app/gitify/actions/workflows/build-app.yml/badge.svg
[build-workflow-badge]: https://github.com/gitify-app/gitify/actions/workflows/build.yml/badge.svg
[release-workflow-badge]: https://github.com/gitify-app/gitify/actions/workflows/release.yml/badge.svg
[downloads-total-badge]: https://img.shields.io/github/downloads/gitify-app/gitify/total?label=downloads@all
[downloads-latest-badge]: https://img.shields.io/github/downloads/gitify-app/gitify/latest/total
[contributors-badge]: https://img.shields.io/github/contributors/gitify-app/gitify
[librariesio]: https://libraries.io/
[librariesio-badge]: https://img.shields.io/librariesio/github/gitify-app/gitify
[license]: LICENSE
[license-badge]: https://img.shields.io/github/license/gitify-app/gitify
[github-release-badge]: https://img.shields.io/github/v/release/gitify-app/gitify
[homebrew-cask-badge]: https://img.shields.io/homebrew/cask/v/gitify
[jest-website]: https://jestjs.io/
[renovate]: https://renovatebot.com/
[renovate-badge]: https://img.shields.io/badge/renovate-enabled-brightgreen.svg
Binary file modified assets/images/press.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion biome.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
{
"$schema": "https://biomejs.dev/schemas/1.6.4/schema.json",
"$schema": "https://biomejs.dev/schemas/1.8.1/schema.json",
"organizeImports": {
"enabled": true
},
"linter": {
"enabled": true,
"rules": {
"recommended": true,
"nursery": {
"noUnusedFunctionParameters": "error",
"useDefaultSwitchClause": "error"
},
"a11y": {
"useKeyWithClickEvents": "off"
},
"correctness": {
"useExhaustiveDependencies": {
"level": "warn",
Expand Down

0 comments on commit 7230949

Please sign in to comment.