Commit 469893e
committed
fix: resolve duplicate ggml symbols in CI by making whisper-cpp and llama-cpp mutually exclusive
Both whisper-rs and llama-cpp-2 vendor their own copy of ggml, causing
duplicate symbol linker errors on Ubuntu and Windows CI runners.
Changes:
- Remove llama-cpp from default features to avoid conflict
- Add compile-time error if both features are enabled together
- Fix unused import warning with conditional compilation
- Document feature conflict in Cargo.toml and README
- Update build instructions for LLM-only configuration
Users can now choose:
- Default: cargo build (whisper-cpp + onnx)
- LLM mode: cargo build --no-default-features --features llama-cpp,onnx,overlay-indicator
Fixes CI test failures on ubuntu-latest and windows-latest.
fix(tests): skip ChatEngine tests when audio device unavailable
CI runners often lack audio devices, causing test failures on Ubuntu
and Windows. Modified ChatEngine test helper to return Option and skip
tests gracefully when AudioPlayer::new() fails.
Fixes test failures on ubuntu-latest and windows-latest runners.1 parent bf23196 commit 469893e
File tree
5 files changed
+96
-60
lines changed- src
- chat
- daemon
5 files changed
+96
-60
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
103 | 107 | | |
104 | 108 | | |
105 | 109 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
138 | 138 | | |
139 | 139 | | |
140 | 140 | | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
141 | 146 | | |
142 | 147 | | |
143 | 148 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
852 | 852 | | |
853 | 853 | | |
854 | 854 | | |
855 | | - | |
| 855 | + | |
| 856 | + | |
856 | 857 | | |
857 | 858 | | |
858 | 859 | | |
| |||
864 | 865 | | |
865 | 866 | | |
866 | 867 | | |
867 | | - | |
| 868 | + | |
| 869 | + | |
| 870 | + | |
| 871 | + | |
| 872 | + | |
| 873 | + | |
| 874 | + | |
| 875 | + | |
| 876 | + | |
| 877 | + | |
| 878 | + | |
| 879 | + | |
868 | 880 | | |
869 | 881 | | |
870 | 882 | | |
871 | 883 | | |
872 | | - | |
873 | | - | |
| 884 | + | |
| 885 | + | |
| 886 | + | |
874 | 887 | | |
875 | 888 | | |
876 | 889 | | |
877 | 890 | | |
878 | | - | |
879 | | - | |
880 | | - | |
| 891 | + | |
| 892 | + | |
| 893 | + | |
| 894 | + | |
881 | 895 | | |
882 | 896 | | |
883 | 897 | | |
884 | 898 | | |
885 | | - | |
886 | | - | |
887 | | - | |
| 899 | + | |
| 900 | + | |
| 901 | + | |
| 902 | + | |
888 | 903 | | |
889 | 904 | | |
890 | 905 | | |
891 | 906 | | |
892 | | - | |
893 | | - | |
894 | | - | |
895 | | - | |
896 | | - | |
| 907 | + | |
| 908 | + | |
| 909 | + | |
| 910 | + | |
897 | 911 | | |
898 | | - | |
899 | | - | |
900 | | - | |
901 | | - | |
902 | | - | |
903 | | - | |
| 912 | + | |
| 913 | + | |
| 914 | + | |
| 915 | + | |
| 916 | + | |
| 917 | + | |
904 | 918 | | |
905 | | - | |
906 | | - | |
907 | | - | |
908 | | - | |
| 919 | + | |
| 920 | + | |
| 921 | + | |
| 922 | + | |
| 923 | + | |
909 | 924 | | |
910 | 925 | | |
911 | 926 | | |
912 | 927 | | |
913 | | - | |
914 | | - | |
915 | | - | |
916 | | - | |
| 928 | + | |
| 929 | + | |
| 930 | + | |
917 | 931 | | |
918 | | - | |
919 | | - | |
920 | | - | |
| 932 | + | |
| 933 | + | |
| 934 | + | |
| 935 | + | |
921 | 936 | | |
922 | 937 | | |
923 | 938 | | |
924 | 939 | | |
925 | | - | |
926 | | - | |
927 | | - | |
928 | | - | |
929 | | - | |
930 | | - | |
931 | | - | |
932 | | - | |
| 940 | + | |
| 941 | + | |
| 942 | + | |
| 943 | + | |
| 944 | + | |
| 945 | + | |
| 946 | + | |
| 947 | + | |
| 948 | + | |
933 | 949 | | |
934 | 950 | | |
935 | 951 | | |
936 | 952 | | |
937 | | - | |
| 953 | + | |
| 954 | + | |
| 955 | + | |
| 956 | + | |
| 957 | + | |
| 958 | + | |
| 959 | + | |
| 960 | + | |
| 961 | + | |
| 962 | + | |
938 | 963 | | |
939 | | - | |
940 | | - | |
941 | | - | |
942 | | - | |
943 | | - | |
944 | | - | |
945 | | - | |
946 | | - | |
| 964 | + | |
| 965 | + | |
947 | 966 | | |
948 | | - | |
949 | | - | |
950 | | - | |
951 | 967 | | |
952 | 968 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
16 | 19 | | |
17 | 20 | | |
18 | 21 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
7 | 15 | | |
8 | 16 | | |
9 | 17 | | |
| |||
0 commit comments