Skip to content

Commit 9e4bc80

Browse files
devin-ai-integration[bot]yujonglee
devin-ai-integration[bot]
and
yujonglee
committed
Merge origin/main into devin/1764930550-sentry-trace-propagation
Resolved conflicts: - apps/api/src/listen.ts: Combined Sentry trace propagation with new emit events - plugins/listener/src/actors/listener.rs: Combined trace headers with GladiaAdapter and async build methods Co-Authored-By: yujonglee <yujonglee.dev@gmail.com>
2 parents 2e9f8dd + 492fa71 commit 9e4bc80

File tree

2,323 files changed

+89559
-59627
lines changed

Some content is hidden

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

2,323 files changed

+89559
-59627
lines changed

‎.cursor/cli.json‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"permissions": {
3-
"allow": [
4-
"Shell(git)"
5-
],
6-
"deny": [
7-
"Shell(git commit)"
8-
]
3+
"allow": ["Shell(git)"],
4+
"deny": ["Shell(git commit)"]
95
}
106
}

‎.cursor/commands/add-plugin.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ npx @tauri-apps/cli plugin new NAME \
88
- `plugins/analytics` is well maintained plugin, so follow its style & convention. This including removing `rollup.config.js` & `README.md`, and updating `tsconfig.json` & `package.json`.
99
- If not specified, keep the single `ping` fn in `ext.rs`, and also in `commands.rs`.
1010
- After all code written, binding should be generated. `pnpm -F @hypr/plugin-<NAME> codegen`.
11-
- `Cargo.toml`, `apps/desktop/src-tauri/Cargo.toml`, `apps/desktop/package.json`, and `apps/desktop/src-tauri/capabilities/default.json` should be updated as final step.
11+
- `Cargo.toml`, `apps/desktop/src-tauri/Cargo.toml`, `apps/desktop/package.json`, and `apps/desktop/src-tauri/capabilities/default.json` should be updated as final step. Run `pnpm i` after updating `apps/desktop/package.json`.

‎.cursor/commands/manage-cli.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Based on `plugins/cli`, you might need to update:
2+
23
- `apps/web/content/docs/cli.mdx`
34
- `apps/desktop/src-tauri/tauri.conf.json`
45

‎.drizzle/store.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
}
2020
]
2121
]
22-
}
22+
}

‎.github/actions/add-reaction/action.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Add Reaction
2+
description: Add a reaction to a GitHub issue comment
3+
4+
inputs:
5+
token:
6+
description: GitHub token
7+
required: true
8+
repo:
9+
description: Repository (owner/repo)
10+
required: true
11+
comment:
12+
description: Comment ID to react to
13+
required: true
14+
reaction:
15+
description: Reaction to add (eyes, +1, -1, laugh, confused, heart, hooray, rocket)
16+
required: true
17+
18+
runs:
19+
using: composite
20+
steps:
21+
- shell: bash
22+
env:
23+
GH_TOKEN: ${{ inputs.token }}
24+
run: |
25+
gh api repos/${{ inputs.repo }}/issues/comments/${{ inputs.comment }}/reactions \
26+
-f content='${{ inputs.reaction }}' \
27+
--silent

‎.github/actions/argmax_sdk_setup/action.yaml‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
1-
# https://docs.argmaxinc.com/guides/upgrading-to-pro-sdk
1+
# https://app.argmaxinc.com/docs/guides/upgrading-to-pro-sdk
22
# Sets up Argmax Pro SDK registry access for Swift Package Manager
33

44
name: "Setup Argmax SDK"
55
description: "Configure Swift Package Manager registry for Argmax Pro SDK access"
6-
inputs:
7-
api-token:
8-
description: "Argmax SECRET_API_TOKEN for SDK access"
9-
required: true
106
runs:
117
using: "composite"
128
steps:
13-
- name: Setup Argmax Registry
14-
shell: bash
15-
run: |
16-
swift package-registry set --global --scope argmaxinc https://api.argmaxinc.com/v1/sdk
9+
- shell: bash
10+
run: swift package-registry set --global --scope argmaxinc https://api.argmaxinc.com/v1/sdk
1711

18-
- name: Authenticate with Argmax
19-
shell: bash
20-
run: |
21-
swift package-registry login https://api.argmaxinc.com/v1/sdk/login --token "${{ inputs.api-token }}"
12+
- shell: bash
13+
run: swift package-registry login https://api.argmaxinc.com/v1/sdk/login --token "$AM_SECRET_TOKEN"

‎.github/actions/brew_clang/action.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
runs:
2+
using: "composite"
3+
steps:
4+
- shell: bash
5+
run: |
6+
brew install llvm
7+
LLVM_PREFIX=$(brew --prefix llvm)
8+
echo "${LLVM_PREFIX}/bin" >> $GITHUB_PATH
9+
echo "CC=${LLVM_PREFIX}/bin/clang" >> $GITHUB_ENV
10+
echo "CXX=${LLVM_PREFIX}/bin/clang++" >> $GITHUB_ENV
11+
echo "CMAKE_PREFIX_PATH=${LLVM_PREFIX}" >> $GITHUB_ENV

‎.github/actions/check-permission/action.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Check Permission
2+
description: Check if user is allowed to run slash commands
3+
4+
inputs:
5+
user:
6+
description: GitHub username to check
7+
required: true
8+
allowed-users:
9+
description: Pipe-separated list of allowed usernames (e.g. "user1|user2")
10+
required: true
11+
12+
outputs:
13+
allowed:
14+
description: Whether the user is allowed
15+
value: ${{ steps.check.outputs.allowed }}
16+
17+
runs:
18+
using: composite
19+
steps:
20+
- id: check
21+
shell: bash
22+
run: |
23+
case "${{ inputs.user }}" in
24+
${{ inputs.allowed-users }}) echo "allowed=true" >> $GITHUB_OUTPUT ;;
25+
*) echo "allowed=false" >> $GITHUB_OUTPUT ;;
26+
esac

‎.github/actions/comment-result/action.yml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: Comment Result
2+
description: Post a result comment with markdown table
3+
4+
inputs:
5+
token:
6+
description: GitHub token
7+
required: true
8+
repo:
9+
description: Repository (owner/repo)
10+
required: true
11+
issue_number:
12+
description: Issue or PR number
13+
required: true
14+
success:
15+
description: Whether the operation succeeded
16+
required: true
17+
title:
18+
description: Comment title (e.g., "Release triggered", "Staging build triggered")
19+
required: true
20+
data:
21+
description: JSON object with key-value pairs for the table
22+
required: true
23+
24+
runs:
25+
using: composite
26+
steps:
27+
- id: comment
28+
shell: bash
29+
env:
30+
GH_TOKEN: ${{ inputs.token }}
31+
DATA: ${{ inputs.data }}
32+
run: |
33+
json_to_md_table() {
34+
echo "$1" | jq -r '
35+
to_entries |
36+
["| Field | Value |", "| --- | --- |"] +
37+
[.[] | "| \(.key) | \(.value) |"] |
38+
.[]
39+
'
40+
}
41+
42+
if [ "${{ inputs.success }}" = "true" ]; then
43+
EMOJI="🚀"
44+
else
45+
EMOJI="❌"
46+
fi
47+
48+
TABLE=$(json_to_md_table "$DATA")
49+
BODY="$EMOJI ${{ inputs.title }}
50+
51+
$TABLE"
52+
BODY=$(echo "$BODY" | sed 's/^[[:space:]]*//')
53+
54+
gh pr comment ${{ inputs.issue_number }} --repo ${{ inputs.repo }} --body "$BODY" 2>/dev/null || \
55+
gh issue comment ${{ inputs.issue_number }} --repo ${{ inputs.repo }} --body "$BODY"

‎.github/actions/desktop-e2e-linux/action.yml‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ inputs:
88
description: Rust target triple for the build
99
required: false
1010
default: x86_64-unknown-linux-gnu
11-
argos_token:
12-
description: Argos CI token for uploading screenshots
13-
required: false
1411
runs:
1512
using: composite
1613
steps:
14+
- uses: FedericoCarboni/setup-ffmpeg@v3
15+
with:
16+
ffmpeg-version: release
1717
- shell: bash
1818
run: ./scripts/setup-desktop-e2e.sh
1919
- shell: bash
@@ -32,12 +32,30 @@ runs:
3232
3333
echo "Binary path: ${BINARY_PATH}"
3434
echo "APP_BINARY_PATH=${BINARY_PATH}" >> $GITHUB_ENV
35+
36+
# Create logs directory for capturing test output
37+
mkdir -p "${{ github.workspace }}/e2e/blackbox/logs"
38+
echo "E2E_LOGS_DIR=${{ github.workspace }}/e2e/blackbox/logs" >> $GITHUB_ENV
3539
- shell: bash
36-
run: pnpm -F desktop-e2e test
40+
id: e2e-test
41+
run: |
42+
# Run tests and capture output to log file
43+
pnpm -F e2e-blackbox e2e 2>&1 | tee "${{ env.E2E_LOGS_DIR }}/e2e-test-output.log"
44+
exit ${PIPESTATUS[0]}
3745
env:
3846
APP_BINARY_PATH: ${{ env.APP_BINARY_PATH }}
39-
- name: Upload screenshots to Argos
40-
if: ${{ inputs.argos_token != '' }}
47+
continue-on-error: true
48+
- name: Upload E2E logs and videos on failure
49+
if: steps.e2e-test.outcome == 'failure'
50+
uses: actions/upload-artifact@v4
51+
with:
52+
name: e2e-blackbox-artifacts
53+
path: |
54+
${{ github.workspace }}/e2e/blackbox/logs/
55+
${{ github.workspace }}/e2e/blackbox/videos/
56+
retention-days: 7
57+
if-no-files-found: ignore
58+
- name: Fail if tests failed
59+
if: steps.e2e-test.outcome == 'failure'
4160
shell: bash
42-
run: pnpm -F desktop-e2e exec argos upload --token ${{ inputs.argos_token }} --build-name desktop screenshots
43-
working-directory: ${{ github.workspace }}/apps/desktop-e2e
61+
run: exit 1

0 commit comments

Comments
 (0)