Commit 9908417
committed
fix: correct rebase artifacts in backend-matrix.yml and Makefile Fix two issues introduced by the conflict-resolution script during the rebase onto master: 1. .github/backend-matrix.yml: valkey-store entries were merged INTO the cloud-proxy entries (duplicate keys in same YAML map items) instead of being separate list items. This broke cloud-proxy Linux builds and the cloud-proxy darwin entry lost its build-type/lang. Fixed by making them standalone entries and restoring cloud-proxy exactly as on master. 2. Makefile: duplicated .NOTPARALLEL and docker-build-backends lines. Collapsed to single lines that are master's current content plus the valkey-store additions. Also adds the three optional pickups from #10801: - /valkey-store in .gitignore (the built binary) - valkey-store row in docs/content/reference/compatibility-table.md - valkey-store line in backend/README.md
Signed-off-by: Daria Korenieva <daric2612@gmail.com>1 parent cfe33ba commit 9908417
4 files changed
Lines changed: 29 additions & 6 deletions
File tree
- .github
- backend
- docs/content/reference
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5165 | 5165 | | |
5166 | 5166 | | |
5167 | 5167 | | |
5168 | | - | |
5169 | 5168 | | |
5170 | 5169 | | |
5171 | 5170 | | |
| |||
5177 | 5176 | | |
5178 | 5177 | | |
5179 | 5178 | | |
5180 | | - | |
5181 | | - | |
5182 | | - | |
5183 | | - | |
5184 | | - | |
5185 | 5179 | | |
5186 | 5180 | | |
5187 | 5181 | | |
| |||
5196 | 5190 | | |
5197 | 5191 | | |
5198 | 5192 | | |
| 5193 | + | |
| 5194 | + | |
| 5195 | + | |
| 5196 | + | |
| 5197 | + | |
| 5198 | + | |
| 5199 | + | |
| 5200 | + | |
| 5201 | + | |
| 5202 | + | |
| 5203 | + | |
| 5204 | + | |
| 5205 | + | |
| 5206 | + | |
| 5207 | + | |
| 5208 | + | |
| 5209 | + | |
| 5210 | + | |
| 5211 | + | |
| 5212 | + | |
| 5213 | + | |
| 5214 | + | |
| 5215 | + | |
| 5216 | + | |
5199 | 5217 | | |
5200 | 5218 | | |
5201 | 5219 | | |
| |||
5912 | 5930 | | |
5913 | 5931 | | |
5914 | 5932 | | |
| 5933 | + | |
| 5934 | + | |
5915 | 5935 | | |
5916 | 5936 | | |
5917 | 5937 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| 33 | + | |
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
| 59 | + | |
59 | 60 | | |
60 | 61 | | |
61 | 62 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
| 121 | + | |
121 | 122 | | |
122 | 123 | | |
123 | 124 | | |
| |||
0 commit comments