From 4da5ffddb04311f8fef176c111045237031a7d04 Mon Sep 17 00:00:00 2001 From: Ebben Aries Date: Thu, 31 Aug 2023 15:57:53 -0700 Subject: [PATCH 1/2] Fix dependency issues post mvfst/fbthrift introduction - Update github CI/CD workflow to account for mvfst --- .github/workflows/getdeps_linux.yml | 4 ++++ build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/mvfst-rev.txt | 1 + build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- build/fbcode_builder/manifests/fbthrift | 1 + build/fbcode_builder/manifests/mvfst | 2 +- 7 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 build/deps/github_hashes/facebook/mvfst-rev.txt diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index a604ac60b2e..97692782115 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -65,6 +65,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fizz - name: Fetch wangle run: python3 build/fbcode_builder/getdeps.py fetch --no-tests wangle + - name: Fetch mvfst + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests mvfst - name: Fetch fbthrift run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fbthrift - name: Fetch fb303 @@ -125,6 +127,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests fizz - name: Build wangle run: python3 build/fbcode_builder/getdeps.py build --no-tests wangle + - name: Build mvfst + run: python3 build/fbcode_builder/getdeps.py build --no-tests mvfst - name: Build fbthrift run: python3 build/fbcode_builder/getdeps.py build --no-tests fbthrift - name: Build fb303 diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 874ff10e8fc..ab623689286 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8c31d85723dacfe82fd9d3ddf8211bedcac2a87b +Subproject commit 2df227d29d2c67a829279b0bf46e9a9f5778e15e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8090f8779cc..7c1daeb449b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d0254f0af28be32985a43159c3dd8156892f140c +Subproject commit 13897bc4d877622981369d5e43081e5237bcd7d1 diff --git a/build/deps/github_hashes/facebook/mvfst-rev.txt b/build/deps/github_hashes/facebook/mvfst-rev.txt new file mode 100644 index 00000000000..2fca2c21028 --- /dev/null +++ b/build/deps/github_hashes/facebook/mvfst-rev.txt @@ -0,0 +1 @@ +Subproject commit bb2a55c392b2a1f93b820d110b72c54d71d6c379 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ded1831f808..fbcd9b2f2fc 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 11e80ee005219a935e70e56983662c68c1189a61 +Subproject commit ed35f583b1f089f1ae72da8b39ff1c440032c7a8 diff --git a/build/fbcode_builder/manifests/fbthrift b/build/fbcode_builder/manifests/fbthrift index b4ca88315cc..733402be146 100644 --- a/build/fbcode_builder/manifests/fbthrift +++ b/build/fbcode_builder/manifests/fbthrift @@ -23,6 +23,7 @@ fmt folly googletest libsodium +mvfst python-six wangle zstd diff --git a/build/fbcode_builder/manifests/mvfst b/build/fbcode_builder/manifests/mvfst index 3fe11b33115..c2a797be234 100644 --- a/build/fbcode_builder/manifests/mvfst +++ b/build/fbcode_builder/manifests/mvfst @@ -5,7 +5,7 @@ shipit_project = mvfst shipit_fbcode_builder = true [git] -repo_url = https://github.com/facebookincubator/mvfst.git +repo_url = https://github.com/facebook/mvfst.git [build] builder = cmake From ec23251b0429ffe70f45f6d7641491ece605ac37 Mon Sep 17 00:00:00 2001 From: Ebben Aries Date: Fri, 1 Sep 2023 08:14:16 -0700 Subject: [PATCH 2/2] Update URL for zlib-1.2.13 --- build/fbcode_builder/manifests/zlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/manifests/zlib b/build/fbcode_builder/manifests/zlib index 89502194aec..4120366bfd5 100644 --- a/build/fbcode_builder/manifests/zlib +++ b/build/fbcode_builder/manifests/zlib @@ -12,7 +12,7 @@ zlib-devel zlib-static [download] -url = https://zlib.net/zlib-1.2.13.tar.gz +url = https://www.zlib.net/fossils/zlib-1.2.13.tar.gz sha256 = b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 [build]