Skip to content

Commit

Permalink
Merge pull request #132 from nomandhoni-cs/patch-merge-conflict
Browse files Browse the repository at this point in the history
Releasing version 2.4.0
  • Loading branch information
nomandhoni-cs authored Dec 11, 2024
2 parents f3130de + 3539a75 commit 808f9e4
Show file tree
Hide file tree
Showing 268 changed files with 19,094 additions and 16,803 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Auto Draft Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
- name: Install frontend dependencies
run: bun install

- uses: tauri-apps/tauri-action@v0
- uses: tauri-apps/tauri-action@v0.5.16
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VITE_HANDSHAKE_PASSWORD: ${{ secrets.VITE_HANDSHAKE_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
- name: Install frontend dependencies
run: bun install

- uses: tauri-apps/tauri-action@v0
- uses: tauri-apps/tauri-action@v0.5.16
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VITE_HANDSHAKE_PASSWORD: ${{ secrets.VITE_HANDSHAKE_PASSWORD }}
Expand Down
209 changes: 209 additions & 0 deletions .github/workflows/ReleasePublish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
name: Release Publish Package

on:
workflow_dispatch:
inputs:
branch:
description: 'Branch to release'
required: true
default: 'release'

env:
APP_NAME: "Blink Eye"

jobs:
build:
permissions:
contents: write
strategy:
fail-fast: false
matrix:
include:
- platform: 'macos-latest' # for Arm-based Macs (M1 and above)
args: '--target aarch64-apple-darwin'
- platform: 'macos-latest' # for Intel-based Macs
args: '--target x86_64-apple-darwin'
- platform: 'ubuntu-22.04' # for Tauri v2
args: ''
- platform: 'windows-latest'
args: ''

runs-on: ${{ matrix.platform }}

steps:
- uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 'lts/*'

- name: Install Bun
uses: oven-sh/setup-bun@v2
with:
bun-version: latest

- name: Cache Bun dependencies
uses: actions/cache@v4
with:
path: ~/.bun/install/cache
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
restore-keys: |
${{ runner.os }}-bun-
- name: Cache Rust dependencies
uses: actions/cache@v4
with:
path: |
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/
src-tauri/target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-
- name: Install Rust stable
uses: dtolnay/rust-toolchain@stable
with:
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}

- name: Install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-22.04'
run: |
sudo apt-get update
sudo apt-get install -y \
libwebkit2gtk-4.1-dev \
libappindicator3-dev \
librsvg2-dev \
libgtk-3-dev \
patchelf
- name: Install frontend dependencies
run: bun install

- name: Extract version from tag
id: extract-version
run: |
echo "VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
- uses: tauri-apps/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VITE_HANDSHAKE_PASSWORD: ${{ secrets.VITE_HANDSHAKE_PASSWORD }}
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
with:
tagName: v${{ env.VERSION }}
releaseName: 'v${{ env.VERSION }}'
releaseBody: 'See the assets to download this version and install.'
releaseDraft: true
prerelease: false
includeUpdaterJson: true
updaterJsonPreferNsis: true
args: ${{ matrix.args }}

- name: Upload release artifacts
uses: actions/upload-artifact@v4
with:
name: release-${{ matrix.platform }}
path: src-tauri/target/release/bundle/**

publish-packages:
needs: build
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Extract version from tag
id: extract-version
run: echo "VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV

- name: Publish Homebrew Formula to Homebrew Core (macOS)
if: matrix.platform == 'macos-latest'
run: |
# Download the macOS release artifact
curl -L -o BlinkEye.tar.gz https://github.com/nomandhoni-cs/blink-eye/releases/download/v${{ env.VERSION }}/Blink.Eye_x64.app.tar.gz
# Generate the SHA256 checksum
shasum -a 256 BlinkEye.tar.gz > sha256.txt
SHA256=$(cat sha256.txt | awk '{print $1}')

# Create the Homebrew formula file
FORMULA_FILE="blink-eye.rb"
cat <<EOF > $FORMULA_FILE
class BlinkEye < Formula
desc "Blink Eye: Minimalist Eye Care Reminder"
homepage "https://github.com/nomandhoni-cs/blink-eye"
url "https://github.com/nomandhoni-cs/blink-eye/releases/download/v${{ env.VERSION }}/Blink.Eye_x64.app.tar.gz"
sha256 "$SHA256"
version "${{ env.VERSION }}"

def install
bin.install "Blink Eye"
end

test do
system "#{bin}/blink-eye", "--version"
end
end
EOF

# Clone the Homebrew Core repo (forked version)
git clone https://github.com/nomandhoni-cs/homebrew-core.git
cd homebrew-core/Formula

# Add the formula file
mv $FORMULA_FILE .
git config user.name "GitHub Actions"
git config user.email "[email protected]"
git add .
git commit -m "Add Blink Eye v${{ env.VERSION }} formula"

# Push to your forked Homebrew Core repo
git push origin main

- name: Publish Winget Manifest (Windows)
if: matrix.platform == 'windows-latest'
run: |
# Download the Windows release artifact
curl -L -o BlinkEyeInstaller.exe https://github.com/nomandhoni-cs/blink-eye/releases/download/v${{ env.VERSION }}/Blink.Eye_${{ env.VERSION }}_x64-setup.exe
# Generate the SHA256 checksum
sha256sum BlinkEyeInstaller.exe > sha256.txt
SHA256=$(cat sha256.txt | awk '{print $1}')
# Clone the Microsoft Winget repository
git clone https://github.com/microsoft/winget-pkgs.git
cd winget-pkgs/manifests/n/NomanDhoni/BlinkEye
# Create a new manifest directory for the version
mkdir -p ${{ env.VERSION }}
cd ${{ env.VERSION }}
# Create the Winget YAML manifest following Manifest v1.6.0 standard
cat <<EOF > BlinkEye.yaml
PackageIdentifier: NomanDhoni.BlinkEye
PackageVersion: ${{ env.VERSION }}
Publisher: Noman Dhoni
PublisherUrl: https://github.com/nomandhoni-cs
PackageName: Blink Eye
License: GPL-3.0-or-later
ShortDescription: A minimalist eye care and break reminder app for Windows, macOS, and Linux.
InstallerType: exe
Installers:
- Architecture: x64
InstallerUrl: https://github.com/nomandhoni-cs/blink-eye/releases/download/v${{ env.VERSION }}/Blink.Eye_${{ env.VERSION }}_x64-setup.exe
InstallerSha256: $SHA256
ManifestType: installer
ManifestVersion: 1.6.0
EOF
# Push the updated manifest to the Microsoft Winget repository
cd ../../../..
git config user.name "GitHub Actions"
git config user.email "[email protected]"
git add .
git commit -m "Add Blink Eye v${{ env.VERSION }} Winget manifest"
git push origin main
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: install frontend dependencies
run: yarn install # change this to npm, pnpm or bun depending on which one you use.

- uses: tauri-apps/tauri-action@v0
- uses: tauri-apps/tauri-action@v0.5.16
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
25 changes: 25 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Security Policy

## Supported Versions

Blink Eye supports automatic updates starting from version 1.7.0. Below is a list of currently supported versions for security updates:

| Version | Supported |
| -------- | ------------------ |
| 1.7.x | :white_check_mark: |
| < 1.7.0 | :x: |

## Reporting a Vulnerability

If you discover a security vulnerability in Blink Eye, we appreciate your help in disclosing it to us in a responsible manner.

### How to Report
- **Email:** Please send details of the vulnerability to [[email protected]](mailto:[email protected]).
- Include a detailed description of the issue, steps to reproduce, and any potential impacts.

### What to Expect
- **Acknowledgment:** We will acknowledge receipt of your report within 2 business days.
- **Updates:** We will provide regular updates on the status of your report.
- **Resolution:** Once verified, we aim to address security vulnerabilities within 14 days.

Thank you for helping to make Blink Eye secure for everyone!
Binary file modified bun.lockb
Binary file not shown.
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "blink-eye",
"private": true,
"version": "2.3.0",
"version": "2.4.0",
"type": "module",
"displayName": "Blink Eye",
"categories": ["Other"],
Expand All @@ -19,7 +19,9 @@
"@radix-ui/react-dialog": "^1.1.2",
"@radix-ui/react-dropdown-menu": "^2.0.6",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-popover": "^1.1.2",
"@radix-ui/react-progress": "^1.1.0",
"@radix-ui/react-scroll-area": "^1.2.1",
"@radix-ui/react-select": "^2.1.2",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-slider": "^1.2.1",
Expand All @@ -45,6 +47,7 @@
"lucide-react": "^0.460.0",
"nanoid": "^5.0.8",
"react": "^18.2.0",
"react-day-picker": "8.10.1",
"react-dom": "^18.2.0",
"react-hot-toast": "^2.4.1",
"react-router-dom": "^6.25.1",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "Blink-Eye"
version = "2.3.0"
version = "2.4.0"
description = "A minimalist eye care reminder app for Windows, macOS, and Linux."
authors = ["Noman Dhoni"]
edition = "2021"
Expand Down
23 changes: 22 additions & 1 deletion src-tauri/capabilities/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,16 @@
"ReminderWindow",
"ReminderPreviewWindow",
"DashboardWindow",
"screenSaverWindow"
"screenSaverWindow",
"PlainReminderWindow",
"AuroraReminderWindow",
"BeamOfLifeReminderWindow",
"FreeSpiritReminderWindow",
"CanvasShapesReminderWindow",
"ParticleBackgroundReminderWindow",
"PlainGradientAnimationReminderWindow",
"StarryBackgroundReminderWindow",
"ShootingMeteorReminderWindow"
],
"permissions": [
{
Expand All @@ -24,6 +33,18 @@
},
{
"url": "https://blinkeye.vercel.app/api/validatelicense"
},
{
"url": "https://www.blinkeye.app/api/activatelicense"
},
{
"url": "https://www.blinkeye.app/api/validatelicense"
},
{
"url": "https://blinkeye.app/api/activatelicense"
},
{
"url": "https://blinkeye.app/api/validatelicense"
}
],
"deny": []
Expand Down
3 changes: 2 additions & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2.0.6",
"productName": "Blink Eye",
"version": "2.3.0",
"version": "2.4.0",
"identifier": "com.blinkeye.app",
"build": {
"beforeDevCommand": "bun run dev",
Expand Down Expand Up @@ -73,6 +73,7 @@
}
},
"macOS": {
"signingIdentity": "-",
"dmg": {
"appPosition": {
"x": 180,
Expand Down
Loading

0 comments on commit 808f9e4

Please sign in to comment.