Skip to content

Commit 85b25b9

Browse files
committed
Merge branch 'main' into inactive-cursor
2 parents 8ef8362 + e08ba68 commit 85b25b9

246 files changed

Lines changed: 8741 additions & 2585 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.dockerignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
target/
2-
node_modules/
3-
crates/
1+
target
2+
crates
3+
**/node_modules
4+
**/.next

.github/workflows/ci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ jobs:
115115
echo 'VITE_POSTHOG_KEY=${{ secrets.NEXT_PUBLIC_POSTHOG_KEY }}' >> .env
116116
echo 'VITE_POSTHOG_HOST=${{ secrets.NEXT_PUBLIC_POSTHOG_HOST }}' >> .env
117117
echo 'VITE_SERVER_URL=${{ secrets.NEXT_PUBLIC_WEB_URL }}' >> .env
118-
echo "NEXT_PUBLIC_CAP_AWS_REGION=${{ secrets.NEXT_PUBLIC_CAP_AWS_REGION }}" >> .env
119-
echo "NEXT_PUBLIC_CAP_AWS_BUCKET=${{ secrets.NEXT_PUBLIC_CAP_AWS_BUCKET }}" >> .env
120118
121119
cat .env >> $GITHUB_ENV
122120
@@ -185,8 +183,6 @@ jobs:
185183
echo 'VITE_POSTHOG_KEY=${{ secrets.NEXT_PUBLIC_POSTHOG_KEY }}' >> .env
186184
echo 'VITE_POSTHOG_HOST=${{ secrets.NEXT_PUBLIC_POSTHOG_HOST }}' >> .env
187185
echo 'VITE_SERVER_URL=${{ secrets.NEXT_PUBLIC_WEB_URL }}' >> .env
188-
echo "NEXT_PUBLIC_CAP_AWS_REGION=${{ secrets.NEXT_PUBLIC_CAP_AWS_REGION }}" >> .env
189-
echo "NEXT_PUBLIC_CAP_AWS_BUCKET=${{ secrets.NEXT_PUBLIC_CAP_AWS_BUCKET }}" >> .env
190186
191187
- name: Copy .env to apps/desktop
192188
run: cp .env apps/desktop/.env

.github/workflows/docker-build-web.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ jobs:
3636
run: |
3737
echo "WEB_URL=http://localhost:3000" > .env
3838
echo "NEXT_PUBLIC_DOCKER_BUILD=true" >> .env
39-
echo "NEXT_PUBLIC_CAP_AWS_BUCKET=capso" >> .env
40-
echo "NEXT_PUBLIC_CAP_AWS_REGION=us-east-1" >> .env
4139
4240
- name: Login to GitHub Container Registry
4341
uses: docker/login-action@v3

.github/workflows/publish.yml

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ jobs:
132132
if: ${{ needs.draft.outputs.needs_release == 'true' }}
133133
permissions:
134134
contents: write
135+
actions: read
135136
strategy:
136137
fail-fast: false
137138
matrix:
@@ -141,7 +142,7 @@ jobs:
141142
- target: aarch64-apple-darwin
142143
runner: macos-latest-large
143144
- target: x86_64-pc-windows-msvc
144-
runner: windows-latest-l
145+
runner: windows-latest
145146
env:
146147
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
147148
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
@@ -185,8 +186,6 @@ jobs:
185186
echo 'VITE_POSTHOG_KEY=${{ secrets.VITE_POSTHOG_KEY }}' >> .env
186187
echo 'VITE_POSTHOG_HOST=${{ secrets.VITE_POSTHOG_HOST }}' >> .env
187188
echo 'VITE_SERVER_URL=${{ secrets.NEXT_PUBLIC_WEB_URL }}' >> .env
188-
echo "NEXT_PUBLIC_CAP_AWS_REGION=${{ secrets.NEXT_PUBLIC_CAP_AWS_REGION }}" >> .env
189-
echo "NEXT_PUBLIC_CAP_AWS_BUCKET=${{ secrets.NEXT_PUBLIC_CAP_AWS_BUCKET }}" >> .env
190189
echo 'RUST_TARGET_TRIPLE=${{ matrix.settings.target }}' >> .env
191190
192191
- name: Build app
@@ -210,6 +209,52 @@ jobs:
210209
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
211210
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
212211

212+
# - name: Upload unsigned Windows installer
213+
# if: ${{ runner.os == 'Windows' }}
214+
# id: upload_unsigned_windows_installer
215+
# uses: actions/upload-artifact@v4
216+
# with:
217+
# name: unsigned-windows-installer
218+
# path: target/${{ matrix.settings.target }}/release/bundle/nsis/*.exe
219+
# if-no-files-found: error
220+
221+
# - name: Submit SignPath signing request
222+
# if: ${{ runner.os == 'Windows' }}
223+
# id: submit_signpath_signing_request
224+
# uses: signpath/github-action-submit-signing-request@v1
225+
# with:
226+
# api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
227+
# organization-id: ${{ secrets.SIGNPATH_ORGANIZATION_ID }}
228+
# project-slug: ${{ secrets.SIGNPATH_PROJECT_SLUG }}
229+
# signing-policy-slug: ${{ secrets.SIGNPATH_SIGNING_POLICY_SLUG }}
230+
# github-artifact-id: ${{ steps.upload_unsigned_windows_installer.outputs.artifact-id }}
231+
# wait-for-completion: true
232+
# output-artifact-directory: signed-windows-installer
233+
234+
# - name: Restore signed Windows installer
235+
# if: ${{ runner.os == 'Windows' }}
236+
# shell: pwsh
237+
# run: |
238+
# $signedDir = "signed-windows-installer"
239+
# $bundleDir = "target/${{ matrix.settings.target }}/release/bundle/nsis"
240+
241+
# if (-not (Test-Path $signedDir)) {
242+
# throw "Signed artifact directory '$signedDir' not found."
243+
# }
244+
245+
# $executables = Get-ChildItem -Path $signedDir -Filter *.exe -Recurse
246+
# if (-not $executables) {
247+
# throw "No signed executables found in '$signedDir'."
248+
# }
249+
250+
# # Copy signed executables back to the original bundle location for CrabNebula upload
251+
# Write-Host "Copying signed executables to: $bundleDir"
252+
# Copy-Item -Path (Join-Path $signedDir '*.exe') -Destination $bundleDir -Force
253+
254+
# # List the files to verify
255+
# Write-Host "Files in bundle directory after signing:"
256+
# Get-ChildItem -Path $bundleDir -Filter *.exe | ForEach-Object { Write-Host " - $($_.Name)" }
257+
213258
- name: Upload assets
214259
uses: crabnebula-dev/cloud-release@v0
215260
with:

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
auto-install-peers = true
2+
force-legacy-deploy = true

CLAUDE.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ import { getCurrentUser } from "@cap/database/auth/session";
171171
export async function updateVideo(data: FormData) {
172172
const user = await getCurrentUser();
173173
if (!user?.id) throw new Error("Unauthorized");
174-
174+
175175
// Database operations with Drizzle
176176
return await db().update(videos).set({ ... }).where(eq(videos.id, id));
177177
}
@@ -220,7 +220,6 @@ const updateMutation = useMutation({
220220

221221
### Build/Client (selected)
222222
- `NEXT_PUBLIC_WEB_URL`
223-
- `NEXT_PUBLIC_CAP_AWS_BUCKET`, `NEXT_PUBLIC_CAP_AWS_REGION`
224223
- `NEXT_PUBLIC_POSTHOG_KEY`, `NEXT_PUBLIC_POSTHOG_HOST`
225224
- `NEXT_PUBLIC_DOCKER_BUILD` (enables Next.js standalone output)
226225

@@ -268,7 +267,7 @@ const updateMutation = useMutation({
268267
- **Connection errors**: Verify Docker containers are running
269268
- **Schema drift**: Run `pnpm --dir packages/database db:check`
270269

271-
### Desktop App Issues
270+
### Desktop App Issues
272271
- **IPC binding errors**: Restart dev server to regenerate `tauri.ts`
273272
- **Rust compile errors**: Check Cargo.toml dependencies
274273
- **Permission issues**: macOS/Windows may require app permissions
@@ -392,8 +391,8 @@ Minimize `useEffect` usage: compute during render, handle logic in event handler
392391

393392
### Media Processing Flow
394393
```
395-
Desktop Recording → Local Files → Upload to S3 →
396-
Background Processing (tasks service) →
394+
Desktop Recording → Local Files → Upload to S3 →
395+
Background Processing (tasks service) →
397396
Transcription/AI Enhancement → Database Storage
398397
```
399398

0 commit comments

Comments
 (0)