Merge branch 'main' into feat/minimise-to-tray-startup

This commit is contained in:
Paul Makles 2026-02-17 19:30:31 +00:00 committed by GitHub
commit 6b581d39dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 47 additions and 19 deletions

View File

@ -1,7 +1,8 @@
on:
push:
branches:
- "**"
- main
pull_request:
jobs:
build:
@ -15,16 +16,10 @@ jobs:
- name: Checkout assets
run: git -c submodule."assets".update=checkout submodule update --init assets
- name: Install pnpm
uses: pnpm/action-setup@v4
- name: Setup Mise
uses: immich-app/devtools/actions/use-mise@cd24790a7f5f6439ac32cc94f5523cb2de8bfa8c # use-mise-action-v1.1.0
with:
run_install: false
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 22
cache: "pnpm"
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: Install dependencies
run: pnpm install

19
.github/workflows/git-town.yml vendored Normal file
View File

@ -0,0 +1,19 @@
name: Git Town
on:
pull_request:
jobs:
git-town:
name: Display the branch stack
runs-on: ubuntu-slim
if: ${{ !startsWith(github.head_ref, 'release-please--') }}
permissions:
contents: read
pull-requests: write
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- uses: stoatchat/action-git-town@4bc5c942e4603bffa0806b51d5fe5f0bc5deb0ac

View File

@ -1,16 +1,13 @@
{
pkgs ? import <nixpkgs> { },
{ pkgs ? import (fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/77ef7a29d276c6d8303aece3444d61118ef71ac2.tar.gz";
sha256 = "0pm4l48jq8plzrrrisimahxqlcpx7qqq9c99hylmf7p3zlc3phsy";
}) {},
}:
pkgs.mkShell rec {
buildInputs = [
buildInputs = with pkgs; [
# Tools
pkgs.git
pkgs.gh
# Node
pkgs.nodejs
pkgs.nodejs.pkgs.pnpm
pkgs.mise
# Electron
(pkgs.writeShellScriptBin "electron-nix" ''
@ -29,5 +26,15 @@ pkgs.mkShell rec {
pkgs.flatpak-builder
pkgs.elfutils
# flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo
(writeShellScriptBin "fish" ''
exec ${pkgs.fish}/bin/fish -C 'mise activate fish | source' "$@"
'')
];
shellHook = ''
export ELECTRON_OVERRIDE_DIST_PATH="${pkgs.electron}/bin"
export MISE_NODE_COMPILE=false
eval "$(mise activate bash)"
'';
}

5
mise.toml Normal file
View File

@ -0,0 +1,5 @@
[tools]
node = "25.4.0"
pnpm = "10.28.1"
gh = "2.25.0"
"github:git-town/git-town" = "22.4.0"

View File

@ -1,7 +1,9 @@
nodeLinker: hoisted
onlyBuiltDependencies:
- bufferutil
- electron
- electron-winstaller
- esbuild
- register-scheme
- utf-8-validate