From 70740e31e67e342cd4bd5732b5e896dec9014ba4 Mon Sep 17 00:00:00 2001 From: Alois Date: Sun, 28 Jun 2026 19:21:21 +0200 Subject: [PATCH] (fix): try workflow fix --- .forgejo/workflows/deploy-dev.yml | 18 +++++++++--------- .forgejo/workflows/deploy-prod.yml | 18 +++++++++--------- package.json | 6 ++---- temp | 0 4 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 temp diff --git a/.forgejo/workflows/deploy-dev.yml b/.forgejo/workflows/deploy-dev.yml index cd0ca64..665698d 100644 --- a/.forgejo/workflows/deploy-dev.yml +++ b/.forgejo/workflows/deploy-dev.yml @@ -16,13 +16,13 @@ jobs: run: nix develop .#electron --command bun install --frozen-lockfile - name: Copy licenses - run: nix develop .#electron --command bun run copy-licenses + run: nix develop .#electron --command bun --bun run copy-licenses - name: Build packages - run: nix develop .#electron --command bun run build:packages + run: nix develop .#electron --command bun --bun run build:packages - name: Build web - run: nix develop .#electron --command bun run build:web + run: nix develop .#electron --command bun --bun run build:web - name: Deploy run: nix develop .#electron --command rsync -a --delete apps/web/dist/ /var/lib/www/tensamin-web-dev/ @@ -37,10 +37,10 @@ jobs: run: nix develop .#tauri --command bun install --frozen-lockfile - name: Copy licenses - run: nix develop .#tauri --command bun run copy-licenses + run: nix develop .#tauri --command bun --bun run copy-licenses - name: Build packages - run: nix develop .#tauri --command bun run build:packages + run: nix develop .#tauri --command bun --bun run build:packages - name: Setup Android Keystore env: @@ -97,7 +97,7 @@ jobs: fi - name: Build mobile - run: nix develop .#tauri --command bun run build:mobile + run: nix develop .#tauri --command bun --bun run build:mobile - name: Upload mobile artifact uses: https://data.forgejo.org/actions/upload-artifact@v3 @@ -118,10 +118,10 @@ jobs: run: nix develop .#electron --command bun install --frozen-lockfile - name: Copy licenses - run: nix develop .#electron --command bun run copy-licenses + run: nix develop .#electron --command bun --bun run copy-licenses - name: Build packages - run: nix develop .#electron --command bun run build:packages + run: nix develop .#electron --command bun --bun run build:packages - name: Set Electron dev version run: | @@ -141,7 +141,7 @@ jobs: EOF - name: Build Electron desktop - run: nix develop .#electron --command bun run build:desktop + run: nix develop .#electron --command bun --bun run build:desktop - name: Upload desktop artifacts uses: https://data.forgejo.org/actions/upload-artifact@v3 diff --git a/.forgejo/workflows/deploy-prod.yml b/.forgejo/workflows/deploy-prod.yml index f5339aa..b5cdcb6 100644 --- a/.forgejo/workflows/deploy-prod.yml +++ b/.forgejo/workflows/deploy-prod.yml @@ -17,13 +17,13 @@ jobs: run: nix develop .#electron --command bun install --frozen-lockfile - name: Copy licenses - run: nix develop .#electron --command bun run copy-licenses + run: nix develop .#electron --command bun --bun run copy-licenses - name: Build packages - run: nix develop .#electron --command bun run build:packages + run: nix develop .#electron --command bun --bun run build:packages - name: Build web - run: nix develop .#electron --command bun run build:web + run: nix develop .#electron --command bun --bun run build:web - name: Deploy run: nix develop .#electron --command rsync -a --delete apps/web/dist/ /var/lib/www/tensamin-web-prod/ @@ -38,10 +38,10 @@ jobs: run: nix develop .#tauri --command bun install --frozen-lockfile - name: Copy licenses - run: nix develop .#tauri --command bun run copy-licenses + run: nix develop .#tauri --command bun --bun run copy-licenses - name: Build packages - run: nix develop .#tauri --command bun run build:packages + run: nix develop .#tauri --command bun --bun run build:packages - name: Setup Android Keystore env: @@ -98,7 +98,7 @@ jobs: fi - name: Build mobile - run: nix develop .#tauri --command bun run build:mobile + run: nix develop .#tauri --command bun --bun run build:mobile - name: Upload mobile artifact uses: https://data.forgejo.org/actions/upload-artifact@v3 @@ -119,10 +119,10 @@ jobs: run: nix develop .#electron --command bun install --frozen-lockfile - name: Copy licenses - run: nix develop .#electron --command bun run copy-licenses + run: nix develop .#electron --command bun --bun run copy-licenses - name: Build packages - run: nix develop .#electron --command bun run build:packages + run: nix develop .#electron --command bun --bun run build:packages - name: Set Electron prod version run: | @@ -140,7 +140,7 @@ jobs: EOF - name: Build Electron desktop - run: nix develop .#electron --command bun run build:desktop + run: nix develop .#electron --command bun --bun run build:desktop - name: Upload desktop artifacts uses: https://data.forgejo.org/actions/upload-artifact@v3 diff --git a/package.json b/package.json index 5458b53..0fc8932 100644 --- a/package.json +++ b/package.json @@ -9,15 +9,13 @@ "type": "module", "scripts": { "format": "bunx prettier --write .", - "lint": "if command -v nix >/dev/null 2>&1 && [ -z \"$IN_NIX_SHELL\" ]; then nix develop .#electron --command bun run lint:raw; else bun run lint:raw; fi", - "lint:raw": "bun scripts/lint-packages.ts", + "lint": "bun scripts/lint-packages.ts", "check": "fallow && bun run lint", "copy-licenses": "bun scripts/copy-licenses.ts", "copy-releases": "bun scripts/copy-releases.ts", "pre-build": "bun run lint && bun run build:packages", "build:apps": "bun run copy-licenses && bun run pre-build && bun run build:mobile && bun run build:desktop && bun --bun run copy-releases", - "build:packages": "if command -v nix >/dev/null 2>&1 && [ -z \"$IN_NIX_SHELL\" ]; then nix develop .#electron --command bun run build:packages:raw; else bun run build:packages:raw; fi", - "build:packages:raw": "bun scripts/build-packages.ts", + "build:packages": "bun scripts/build-packages.ts", "update:packages": "bun scripts/update-packages.ts", "dev:web": "cd apps/web && bun dev", "build:web": "cd apps/web && bun run build", diff --git a/temp b/temp deleted file mode 100644 index e69de29..0000000