From 0347fb7f15ea10e799d4936553492b5080f9b1bb Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Wed, 8 May 2024 22:15:39 -0700 Subject: [PATCH] Switch to bundled buck2 prelude --- .buckconfig | 3 +++ .github/workflows/buck2.yml | 2 -- .gitmodules | 3 --- tools/buck/prelude | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 .gitmodules delete mode 160000 tools/buck/prelude diff --git a/.buckconfig b/.buckconfig index 354fc7758..f7dc00292 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 f91ac3d3d..9c3c54ae2 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 1f0249f5c..000000000 --- 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 index a8336f065..000000000 --- a/tools/buck/prelude +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a8336f065e50b8846de1e5138f3feb8820168fc5