diff options
| author | David Tolnay <dtolnay@gmail.com> | 2024-05-09 11:25:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-09 11:25:34 -0700 |
| commit | 953009edfbe4e125cc556170e1e4c228d68da50b (patch) | |
| tree | df05322018c9fe713f5abde8ca4d26884be74738 | |
| parent | 4fd9c57b18178d903f067318f05a94ecebfbcc80 (diff) | |
| parent | 0347fb7f15ea10e799d4936553492b5080f9b1bb (diff) | |
| download | cxx-upstream-master.tar.gz | |
Merge pull request #1345 from dtolnay/bundledupstream-master
Switch to bundled buck2 prelude
| -rw-r--r-- | .buckconfig | 3 | ||||
| -rw-r--r-- | .github/workflows/buck2.yml | 2 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | tools/buck/prelude | 0 |
4 files changed, 3 insertions, 5 deletions
diff --git a/.buckconfig b/.buckconfig index 354fc775..f7dc0029 100644 --- a/.buckconfig +++ b/.buckconfig @@ -4,6 +4,9 @@ prelude = tools/buck/prelude toolchains = tools/buck/toolchains none = none +[external_cells] +prelude = bundled + [cell_aliases] config = prelude buck = none diff --git a/.github/workflows/buck2.yml b/.github/workflows/buck2.yml index f91ac3d3..9c3c54ae 100644 --- a/.github/workflows/buck2.yml +++ b/.github/workflows/buck2.yml @@ -23,8 +23,6 @@ jobs: with: components: rust-src - uses: dtolnay/install-buck2@latest - with: - prelude-submodule: tools/buck/prelude - run: buck2 run demo - run: buck2 build ... - run: buck2 test ... diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 1f0249f5..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "tools/buck/prelude"] - path = tools/buck/prelude - url = https://github.com/facebook/buck2-prelude diff --git a/tools/buck/prelude b/tools/buck/prelude deleted file mode 160000 -Subproject a8336f065e50b8846de1e5138f3feb8820168fc |