Commit 18b67de
committed
chore: Upgrade base (semgrep/semgrep-proprietary#3869)
This week's Homebrew release [failed](Homebrew/homebrew-core#222682). I can reproduce the failure locally by running `brew install --head semgrep`, but I cannot reproduce the failure by running `make setup` in my Semgrep repository, even though both try to install the same version of `base`. I am not sure why that is.
Regardless, we are not the only people to experience this error when attempting to build `base`. It [looks like](janestreet/base#178) an incompatibility with a newer version of the macOS developer tools. `base` has released a patch for it, but it's only been backported in `opam` to 17.1.
So, I'm bumping the version of `base`. I also had to bump `ppx_sexp_conv` in order to do so. While I was in there I removed a redundant dependency on `base`.
I am hoping that this will address the homebrew issue. Once this is synced to OSS I'll test it using `brew install --head semgrep`.
Test plan: CI
synced from Pro 78d75b4a1db42a398186382f7ef21acda949c9d01 parent 5ad5062 commit 18b67de
3 files changed
+7
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
65 | | - | |
66 | 65 | | |
67 | 66 | | |
68 | 67 | | |
| |||
74 | 73 | | |
75 | 74 | | |
76 | 75 | | |
77 | | - | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
78 | 79 | | |
79 | 80 | | |
80 | 81 | | |
| |||
109 | 110 | | |
110 | 111 | | |
111 | 112 | | |
112 | | - | |
| 113 | + | |
113 | 114 | | |
114 | 115 | | |
115 | 116 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
22 | 21 | | |
23 | 22 | | |
24 | 23 | | |
25 | | - | |
| 24 | + | |
26 | 25 | | |
27 | 26 | | |
28 | 27 | | |
| |||
50 | 49 | | |
51 | 50 | | |
52 | 51 | | |
53 | | - | |
| 52 | + | |
54 | 53 | | |
55 | 54 | | |
56 | 55 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
| 124 | + | |
124 | 125 | | |
125 | 126 | | |
126 | 127 | | |
| |||
0 commit comments