Commit 58d1709
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 aadaccb commit 58d1709
5 files changed
Lines changed: 31 additions & 10 deletions
File tree
- .github
- backend
- docs/content/reference
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5017 | 5017 | | |
5018 | 5018 | | |
5019 | 5019 | | |
5020 | | - | |
5021 | 5020 | | |
5022 | 5021 | | |
5023 | 5022 | | |
| |||
5029 | 5028 | | |
5030 | 5029 | | |
5031 | 5030 | | |
5032 | | - | |
5033 | | - | |
5034 | | - | |
5035 | | - | |
5036 | | - | |
5037 | 5031 | | |
5038 | 5032 | | |
5039 | 5033 | | |
| |||
5048 | 5042 | | |
5049 | 5043 | | |
5050 | 5044 | | |
| 5045 | + | |
| 5046 | + | |
| 5047 | + | |
| 5048 | + | |
| 5049 | + | |
| 5050 | + | |
| 5051 | + | |
| 5052 | + | |
| 5053 | + | |
| 5054 | + | |
| 5055 | + | |
| 5056 | + | |
| 5057 | + | |
| 5058 | + | |
| 5059 | + | |
| 5060 | + | |
| 5061 | + | |
| 5062 | + | |
| 5063 | + | |
| 5064 | + | |
| 5065 | + | |
| 5066 | + | |
| 5067 | + | |
| 5068 | + | |
5051 | 5069 | | |
5052 | 5070 | | |
5053 | 5071 | | |
| |||
5760 | 5778 | | |
5761 | 5779 | | |
5762 | 5780 | | |
| 5781 | + | |
| 5782 | + | |
5763 | 5783 | | |
5764 | 5784 | | |
5765 | 5785 | | |
| |||
| 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 | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | | - | |
| 2 | + | |
4 | 3 | | |
5 | 4 | | |
6 | 5 | | |
| |||
1408 | 1407 | | |
1409 | 1408 | | |
1410 | 1409 | | |
1411 | | - | |
1412 | | - | |
| 1410 | + | |
1413 | 1411 | | |
1414 | 1412 | | |
1415 | 1413 | | |
| |||
| 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 | |
|---|---|---|---|
| |||
117 | 117 | | |
118 | 118 | | |
119 | 119 | | |
| 120 | + | |
120 | 121 | | |
121 | 122 | | |
122 | 123 | | |
| |||
0 commit comments