Skip to content

Commit 5d6e68e

Browse files
devvaannshdevvaannsh
authored
Merge branch 'main' into pluto/snippets
2 parents da0e9df + 9c5ad2a commit 5d6e68e

File tree

102 files changed

+2940
-360
lines changed

Some content is hidden

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

102 files changed

+2940
-360
lines changed

‎.github/workflows/desktop-linux-prod-test-pull.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,35 +48,67 @@ jobs:
4848
4949
- name: Run tauri unit tests
5050
uses: nick-fields/retry@v2
51+
id: linuxRunUnit
52+
continue-on-error: true
5153
with:
5254
timeout_minutes: 12
5355
max_attempts: 3
5456
command: xvfb-run ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=unit -q
5557

5658
- name: Run tauri integration tests
5759
uses: nick-fields/retry@v2
60+
id: linuxRunIntegration
61+
continue-on-error: true
5862
with:
5963
timeout_minutes: 12
6064
max_attempts: 3
6165
command: xvfb-run ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=integration -q
6266

6367
- name: Run tauri mainview tests
6468
uses: nick-fields/retry@v2
69+
id: linuxRunMainview
70+
continue-on-error: true
6571
with:
6672
timeout_minutes: 12
6773
max_attempts: 3
6874
command: xvfb-run ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=mainview -q
6975

7076
- name: Run tauri livepreview tests
7177
uses: nick-fields/retry@v2
78+
id: linuxRunLivepreview
79+
continue-on-error: true
7280
with:
7381
timeout_minutes: 12
7482
max_attempts: 3
7583
command: xvfb-run ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=livepreview -q
7684

7785
- name: Run tauri LegacyInteg tests
7886
uses: nick-fields/retry@v2
87+
id: linuxRunLegacyInteg
88+
continue-on-error: true
7989
with:
8090
timeout_minutes: 20
8191
max_attempts: 3
8292
command: xvfb-run ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=LegacyInteg -q
93+
94+
- name: Fail on test runs failed in Linux
95+
if: steps.linuxRunUnit.outcome == 'failure' || steps.linuxRunIntegration.outcome == 'failure' || steps.linuxRunMainview.outcome == 'failure' || steps.linuxRunLivepreview.outcome == 'failure' || steps.linuxRunLegacyInteg.outcome == 'failure'
96+
run: |
97+
echo "Linux tests failed, marking step as failed"
98+
echo "Failed tests:"
99+
if [ "${{ steps.linuxRunUnit.outcome }}" == "failure" ]; then
100+
echo "- Run tauri unit tests"
101+
fi
102+
if [ "${{ steps.linuxRunIntegration.outcome }}" == "failure" ]; then
103+
echo "- Run tauri integration tests"
104+
fi
105+
if [ "${{ steps.linuxRunMainview.outcome }}" == "failure" ]; then
106+
echo "- Run tauri mainview tests"
107+
fi
108+
if [ "${{ steps.linuxRunLivepreview.outcome }}" == "failure" ]; then
109+
echo "- Run tauri livepreview tests"
110+
fi
111+
if [ "${{ steps.linuxRunLegacyInteg.outcome }}" == "failure" ]; then
112+
echo "- Run tauri LegacyInteg tests"
113+
fi
114+
exit 1

‎.github/workflows/desktop-linux-test-pull.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,35 +47,67 @@ jobs:
4747
4848
- name: Run tauri unit tests
4949
uses: nick-fields/retry@v2
50+
id: linuxRunUnit
51+
continue-on-error: true
5052
with:
5153
timeout_minutes: 12
5254
max_attempts: 3
5355
command: xvfb-run ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=unit -q
5456

5557
- name: Run tauri integration tests
5658
uses: nick-fields/retry@v2
59+
id: linuxRunIntegration
60+
continue-on-error: true
5761
with:
5862
timeout_minutes: 12
5963
max_attempts: 3
6064
command: xvfb-run ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=integration -q
6165

6266
- name: Run tauri mainview tests
6367
uses: nick-fields/retry@v2
68+
id: linuxRunMainview
69+
continue-on-error: true
6470
with:
6571
timeout_minutes: 12
6672
max_attempts: 3
6773
command: xvfb-run ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=mainview -q
6874

6975
- name: Run tauri livepreview tests
7076
uses: nick-fields/retry@v2
77+
id: linuxRunLivepreview
78+
continue-on-error: true
7179
with:
7280
timeout_minutes: 12
7381
max_attempts: 3
7482
command: xvfb-run ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=livepreview -q
7583

7684
- name: Run tauri LegacyInteg tests
7785
uses: nick-fields/retry@v2
86+
id: linuxRunLegacyInteg
87+
continue-on-error: true
7888
with:
7989
timeout_minutes: 20
8090
max_attempts: 3
8191
command: xvfb-run ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=LegacyInteg -q
92+
93+
- name: Fail on test runs failed in Linux
94+
if: steps.linuxRunUnit.outcome == 'failure' || steps.linuxRunIntegration.outcome == 'failure' || steps.linuxRunMainview.outcome == 'failure' || steps.linuxRunLivepreview.outcome == 'failure' || steps.linuxRunLegacyInteg.outcome == 'failure'
95+
run: |
96+
echo "Linux tests failed, marking step as failed"
97+
echo "Failed tests:"
98+
if [ "${{ steps.linuxRunUnit.outcome }}" == "failure" ]; then
99+
echo "- Run tauri unit tests"
100+
fi
101+
if [ "${{ steps.linuxRunIntegration.outcome }}" == "failure" ]; then
102+
echo "- Run tauri integration tests"
103+
fi
104+
if [ "${{ steps.linuxRunMainview.outcome }}" == "failure" ]; then
105+
echo "- Run tauri mainview tests"
106+
fi
107+
if [ "${{ steps.linuxRunLivepreview.outcome }}" == "failure" ]; then
108+
echo "- Run tauri livepreview tests"
109+
fi
110+
if [ "${{ steps.linuxRunLegacyInteg.outcome }}" == "failure" ]; then
111+
echo "- Run tauri LegacyInteg tests"
112+
fi
113+
exit 1

‎.github/workflows/desktop-mac-m1-test-pull.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,35 +40,67 @@ jobs:
4040
4141
- name: Run tauri unit tests
4242
uses: nick-fields/retry@v2
43+
id: macM1RunUnit
44+
continue-on-error: true
4345
with:
4446
timeout_minutes: 12
4547
max_attempts: 3
4648
command: ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=unit -q
4749

4850
- name: Run tauri integration tests
4951
uses: nick-fields/retry@v2
52+
id: macM1RunIntegration
53+
continue-on-error: true
5054
with:
5155
timeout_minutes: 12
5256
max_attempts: 3
5357
command: ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=integration -q
5458

5559
- name: Run tauri mainview tests
5660
uses: nick-fields/retry@v2
61+
id: macM1RunMainview
62+
continue-on-error: true
5763
with:
5864
timeout_minutes: 12
5965
max_attempts: 3
6066
command: ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=mainview -q
6167

6268
- name: Run tauri livepreview tests
6369
uses: nick-fields/retry@v2
70+
id: macM1RunLivepreview
71+
continue-on-error: true
6472
with:
6573
timeout_minutes: 12
6674
max_attempts: 3
6775
command: ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=livepreview -q
6876

6977
- name: Run tauri LegacyInteg tests
7078
uses: nick-fields/retry@v2
79+
id: macM1RunLegacyInteg
80+
continue-on-error: true
7181
with:
7282
timeout_minutes: 30
7383
max_attempts: 3
7484
command: ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=LegacyInteg -q
85+
86+
- name: Fail on test runs failed in Mac M1
87+
if: steps.macM1RunUnit.outcome == 'failure' || steps.macM1RunIntegration.outcome == 'failure' || steps.macM1RunMainview.outcome == 'failure' || steps.macM1RunLivepreview.outcome == 'failure' || steps.macM1RunLegacyInteg.outcome == 'failure'
88+
run: |
89+
echo "Mac M1 tests failed, marking step as failed"
90+
echo "Failed tests:"
91+
if [ "${{ steps.macM1RunUnit.outcome }}" == "failure" ]; then
92+
echo "- Run tauri unit tests"
93+
fi
94+
if [ "${{ steps.macM1RunIntegration.outcome }}" == "failure" ]; then
95+
echo "- Run tauri integration tests"
96+
fi
97+
if [ "${{ steps.macM1RunMainview.outcome }}" == "failure" ]; then
98+
echo "- Run tauri mainview tests"
99+
fi
100+
if [ "${{ steps.macM1RunLivepreview.outcome }}" == "failure" ]; then
101+
echo "- Run tauri livepreview tests"
102+
fi
103+
if [ "${{ steps.macM1RunLegacyInteg.outcome }}" == "failure" ]; then
104+
echo "- Run tauri LegacyInteg tests"
105+
fi
106+
exit 1

‎.github/workflows/desktop-mac-test-pull.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,35 +40,67 @@ jobs:
4040
4141
- name: Run tauri unit tests
4242
uses: nick-fields/retry@v2
43+
id: macRunUnit
44+
continue-on-error: true
4345
with:
4446
timeout_minutes: 12
4547
max_attempts: 3
4648
command: ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=unit -q
4749

4850
- name: Run tauri integration tests
4951
uses: nick-fields/retry@v2
52+
id: macRunIntegration
53+
continue-on-error: true
5054
with:
5155
timeout_minutes: 12
5256
max_attempts: 3
5357
command: ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=integration -q
5458

5559
- name: Run tauri mainview tests
5660
uses: nick-fields/retry@v2
61+
id: macRunMainview
62+
continue-on-error: true
5763
with:
5864
timeout_minutes: 12
5965
max_attempts: 3
6066
command: ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=mainview -q
6167

6268
- name: Run tauri livepreview tests
6369
uses: nick-fields/retry@v2
70+
id: macRunLivepreview
71+
continue-on-error: true
6472
with:
6573
timeout_minutes: 12
6674
max_attempts: 3
6775
command: ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=livepreview -q
6876

6977
- name: Run tauri LegacyInteg tests
7078
uses: nick-fields/retry@v2
79+
id: macRunLegacyInteg
80+
continue-on-error: true
7181
with:
7282
timeout_minutes: 30
7383
max_attempts: 3
7484
command: ../phoenix-desktop/src-tauri/target/debug/phoenix-test --run-tests=LegacyInteg -q
85+
86+
- name: Fail on test runs failed in Mac
87+
if: steps.macRunUnit.outcome == 'failure' || steps.macRunIntegration.outcome == 'failure' || steps.macRunMainview.outcome == 'failure' || steps.macRunLivepreview.outcome == 'failure' || steps.macRunLegacyInteg.outcome == 'failure'
88+
run: |
89+
echo "Mac tests failed, marking step as failed"
90+
echo "Failed tests:"
91+
if [ "${{ steps.macRunUnit.outcome }}" == "failure" ]; then
92+
echo "- Run tauri unit tests"
93+
fi
94+
if [ "${{ steps.macRunIntegration.outcome }}" == "failure" ]; then
95+
echo "- Run tauri integration tests"
96+
fi
97+
if [ "${{ steps.macRunMainview.outcome }}" == "failure" ]; then
98+
echo "- Run tauri mainview tests"
99+
fi
100+
if [ "${{ steps.macRunLivepreview.outcome }}" == "failure" ]; then
101+
echo "- Run tauri livepreview tests"
102+
fi
103+
if [ "${{ steps.macRunLegacyInteg.outcome }}" == "failure" ]; then
104+
echo "- Run tauri LegacyInteg tests"
105+
fi
106+
exit 1

‎.github/workflows/desktop-windows-test-pull.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,5 +113,21 @@ jobs:
113113
if: steps.windowsRunUnit.outcome == 'failure' || steps.windowsRunIntegration.outcome == 'failure' || steps.windowsRunMainview.outcome == 'failure' || steps.windowsRunLivepreview.outcome == 'failure' || steps.windowsRunLegacyInteg.outcome == 'failure'
114114
run: |
115115
echo "Windows tests failed, marking step as failed"
116+
echo "Failed tests:"
117+
if "${{ steps.windowsRunUnit.outcome }}" == "failure" (
118+
echo "- Run tauri unit tests"
119+
)
120+
if "${{ steps.windowsRunIntegration.outcome }}" == "failure" (
121+
echo "- Run tauri integration tests"
122+
)
123+
if "${{ steps.windowsRunMainview.outcome }}" == "failure" (
124+
echo "- Run tauri mainview tests"
125+
)
126+
if "${{ steps.windowsRunLivepreview.outcome }}" == "failure" (
127+
echo "- Run tauri livepreview tests"
128+
)
129+
if "${{ steps.windowsRunLegacyInteg.outcome }}" == "failure" (
130+
echo "- Run tauri LegacyInteg tests"
131+
)
116132
exit 1
117133
shell: cmd

‎docs/API-Reference/command/Commands.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -824,18 +824,6 @@ Sorts working set by file type
824824
## CMD\_WORKING\_SORT\_TOGGLE\_AUTO
825825
Toggles automatic working set sorting
826826

827-
**Kind**: global variable
828-
<a name="CMD_TOGGLE_SHOW_WORKING_SET"></a>
829-
830-
## CMD\_TOGGLE\_SHOW\_WORKING\_SET
831-
Toggles working set visibility
832-
833-
**Kind**: global variable
834-
<a name="CMD_TOGGLE_SHOW_FILE_TABS"></a>
835-
836-
## CMD\_TOGGLE\_SHOW\_FILE\_TABS
837-
Toggles file tabs visibility
838-
839827
**Kind**: global variable
840828
<a name="CMD_TOGGLE_SHOW_WORKING_SET"></a>
841829

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "phoenix",
3-
"version": "4.1.1-0",
4-
"apiVersion": "4.1.1",
3+
"version": "4.1.2-0",
4+
"apiVersion": "4.1.2",
55
"homepage": "https://core.ai",
66
"issues": {
77
"url": "https://github.com/phcode-dev/phoenix/issues"

0 commit comments

Comments
 (0)