Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .cursor/rules/authentication.mdc
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ Frontend listens to these events in `src/App.tsx` to update UI and refresh data.

## Environment Variables

- **EVE_CLIENT_ID** (required): OAuth client ID from EVE Developers portal
- **EVE_CALLBACK_URL** (optional): Override default callback URL
- **EVE_CLIENT_ID** (required): OAuth client ID from EVE Developers portal. Can be set in a `.env` file in the project root.
- **EVE_CALLBACK_URL** (optional): Override default callback URL. Can be set in a `.env` file in the project root.

## Security Considerations

Expand Down
8 changes: 8 additions & 0 deletions .cursor/rules/project-setup.mdc
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,17 @@ alwaysApply: true

## Environment Variables

The application reads environment variables from the system environment or a `.env` file in the project root.

- **EVE_CLIENT_ID** (required): EVE Online SSO client ID for OAuth authentication
- **EVE_CALLBACK_URL** (optional): OAuth callback URL, defaults to `http://localhost:1421/callback` for development

Example `.env` file:
```env
EVE_CLIENT_ID=your_client_id_here
EVE_CALLBACK_URL=http://localhost:1421/callback
```

## Development Commands

- `pnpm dev` - Start Vite dev server for frontend development
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,52 @@
name: Build Windows
name: Build Adhoc

on:
workflow_dispatch:
inputs:
platform:
description: 'Platform to build'
required: true
default: 'All'
type: choice
options:
- All
- Windows
- Linux
- macOS

jobs:
build:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
include:
- platform_name: Windows
os: windows-latest
target: x86_64-pc-windows-msvc
- platform_name: Linux
os: ubuntu-latest
target: x86_64-unknown-linux-gnu
- platform_name: macOS
os: macos-latest
target: aarch64-apple-darwin
runs-on: ${{ matrix.os }}
# Only run if 'All' is selected or the specific platform is selected
if: |
github.event.inputs.platform == 'All' ||
github.event.inputs.platform == matrix.platform_name
steps:
- uses: actions/checkout@v4

- name: Install Linux dependencies
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
targets: x86_64-pc-windows-msvc
targets: ${{ matrix.target }}

- name: Install Node.js
uses: actions/setup-node@v4
Expand Down Expand Up @@ -41,7 +75,9 @@ jobs:
id: cache-oas3-gen
uses: actions/cache@v4
with:
path: ~/.cargo/bin/oas3-gen.exe
path: |
~/.cargo/bin/oas3-gen
~/.cargo/bin/oas3-gen.exe
key: ${{ runner.os }}-oas3-gen-0.22.1

- name: Install oas3-gen
Expand All @@ -52,7 +88,11 @@ jobs:
id: cache-tauri-typegen
uses: actions/cache@v4
with:
path: ~/.cargo/bin/cargo-tauri-typegen.exe
path: |
~/.cargo/bin/cargo-tauri-typegen
~/.cargo/bin/cargo-tauri-typegen.exe
~/.cargo/bin/tauri-typegen
~/.cargo/bin/tauri-typegen.exe
key: ${{ runner.os }}-tauri-typegen-0.3.4

- name: Install tauri-typegen
Expand Down Expand Up @@ -91,10 +131,29 @@ jobs:
EVE_CLIENT_ID: ${{ secrets.EVE_CLIENT_ID }}
run: pnpm tauri build

- name: Upload installer
- name: Upload installer (Windows)
if: matrix.os == 'windows-latest'
uses: actions/upload-artifact@v4
with:
name: skillmon-windows-installer
name: skillmon-windows
path: |
src-tauri/target/release/bundle/msi/*.msi
src-tauri/target/release/bundle/nsis/*.exe

- name: Upload bundle (Linux)
if: matrix.os == 'ubuntu-latest'
uses: actions/upload-artifact@v4
with:
name: skillmon-linux
path: |
src-tauri/target/release/bundle/deb/*.deb
src-tauri/target/release/bundle/appimage/*.AppImage

- name: Upload bundle (macOS)
if: matrix.os == 'macos-latest'
uses: actions/upload-artifact@v4
with:
name: skillmon-macos
path: |
src-tauri/target/release/bundle/dmg/*.dmg
src-tauri/target/release/bundle/macos/*.app
104 changes: 73 additions & 31 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,78 @@ on:
type: string

jobs:
release:
prepare:
permissions:
contents: write
runs-on: windows-latest
runs-on: ubuntu-latest
outputs:
version: ${{ inputs.version }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: '24'

- name: Install Rust
uses: dtolnay/rust-toolchain@stable

- name: Update version files
shell: bash
run: bash scripts/update-version.sh "${{ inputs.version }}"

- name: Create git tag
shell: bash
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git add package.json src-tauri/tauri.conf.json src-tauri/Cargo.toml src-tauri/Cargo.lock

if git diff --staged --quiet; then
echo "Error: No changes detected after updating version files"
exit 1
fi

git commit -m "chore: bump version to ${{ inputs.version }}"
git tag -a "v${{ inputs.version }}" -m "Release v${{ inputs.version }}"
git push origin HEAD
git push origin "v${{ inputs.version }}"

build:
needs: prepare
permissions:
contents: write
strategy:
fail-fast: false
matrix:
include:
- platform: 'windows-latest'
target: 'x86_64-pc-windows-msvc'
# - platform: 'macos-latest'
# target: 'aarch64-apple-darwin'
# - platform: 'ubuntu-latest'
# target: 'x86_64-unknown-linux-gnu'
runs-on: ${{ matrix.platform }}
env:
HUSKY: 0
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: v${{ needs.prepare.outputs.version }}

- name: Install Linux dependencies
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
targets: x86_64-pc-windows-msvc
targets: ${{ matrix.target }}

- name: Install Node.js
uses: actions/setup-node@v4
Expand Down Expand Up @@ -54,7 +111,9 @@ jobs:
id: cache-oas3-gen
uses: actions/cache@v4
with:
path: ~/.cargo/bin/oas3-gen.exe
path: |
~/.cargo/bin/oas3-gen
~/.cargo/bin/oas3-gen.exe
key: ${{ runner.os }}-oas3-gen-0.22.1

- name: Install oas3-gen
Expand All @@ -65,7 +124,11 @@ jobs:
id: cache-tauri-typegen
uses: actions/cache@v4
with:
path: ~/.cargo/bin/cargo-tauri-typegen.exe
path: |
~/.cargo/bin/cargo-tauri-typegen
~/.cargo/bin/cargo-tauri-typegen.exe
~/.cargo/bin/tauri-typegen
~/.cargo/bin/tauri-typegen.exe
key: ${{ runner.os }}-tauri-typegen-0.3.4

- name: Install tauri-typegen
Expand Down Expand Up @@ -99,39 +162,18 @@ jobs:
- name: Generate route tree
run: pnpm generate-route-tree

- name: Update version files
shell: bash
run: bash scripts/update-version.sh "${{ inputs.version }}"

- name: Type check
run: pnpm typecheck

- name: Create git tag
shell: bash
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git add package.json src-tauri/tauri.conf.json src-tauri/Cargo.toml

# Check if there are changes to commit
if git diff --staged --quiet; then
echo "Error: No changes detected after updating version files"
echo "This indicates the version update script may have failed"
exit 1
fi

git commit -m "chore: bump version to ${{ inputs.version }}"
git tag -a "v${{ inputs.version }}" -m "Release v${{ inputs.version }}"
git push origin HEAD
git push origin "v${{ inputs.version }}"

- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
EVE_CLIENT_ID: ${{ secrets.EVE_CLIENT_ID }}
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
with:
tagName: v__VERSION__
releaseName: 'Skillmon v__VERSION__'
tagName: v${{ needs.prepare.outputs.version }}
releaseName: 'Skillmon v${{ needs.prepare.outputs.version }}'
releaseBody: 'See the assets to download this version and install.'
releaseDraft: true
prerelease: false
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ src/routeTree.gen.ts
sde/*.jsonl
eve-online-static-data-*.zip
src-tauri/tests/fixtures/sde_cache/

# Environment variables
.env
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2026 snipereagle1

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Loading