Skip to content

Commit ee46958

Browse files
nspringfacebook-github-bot
authored andcommitted
watchman autobuild on ubuntu 24.04 (facebook#1312)
Summary: experiment to see whether the library / test-hang issue is specific to 22 not 24. Differential Revision: D86626357
1 parent f3b8a31 commit ee46958

5 files changed

Lines changed: 26 additions & 7 deletions

File tree

.github/workflows/getdeps_linux.yml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permissions:
1515

1616
jobs:
1717
build:
18-
runs-on: ubuntu-22.04
18+
runs-on: ubuntu-24.04
1919
steps:
2020
- uses: actions/checkout@v4
2121
- name: Show disk space at start
@@ -36,6 +36,9 @@ jobs:
3636
- name: Fetch boost
3737
if: ${{ steps.paths.outputs.boost_SOURCE }}
3838
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests boost
39+
- name: Fetch bz2
40+
if: ${{ steps.paths.outputs.bz2_SOURCE }}
41+
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests bz2
3942
- name: Fetch ninja
4043
if: ${{ steps.paths.outputs.ninja_SOURCE }}
4144
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests ninja
@@ -154,6 +157,22 @@ jobs:
154157
with:
155158
path: ${{ steps.paths.outputs.boost_INSTALL }}
156159
key: ${{ steps.paths.outputs.boost_CACHE_KEY }}-install
160+
- name: Restore bz2 from cache
161+
id: restore_bz2
162+
if: ${{ steps.paths.outputs.bz2_SOURCE }}
163+
uses: actions/cache/restore@v4
164+
with:
165+
path: ${{ steps.paths.outputs.bz2_INSTALL }}
166+
key: ${{ steps.paths.outputs.bz2_CACHE_KEY }}-install
167+
- name: Build bz2
168+
if: ${{ steps.paths.outputs.bz2_SOURCE && ! steps.restore_bz2.outputs.cache-hit }}
169+
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --free-up-disk --no-tests bz2
170+
- name: Save bz2 to cache
171+
uses: actions/cache/save@v4
172+
if: ${{ steps.paths.outputs.bz2_SOURCE && ! steps.restore_bz2.outputs.cache-hit }}
173+
with:
174+
path: ${{ steps.paths.outputs.bz2_INSTALL }}
175+
key: ${{ steps.paths.outputs.bz2_CACHE_KEY }}-install
157176
- name: Restore ninja from cache
158177
id: restore_ninja
159178
if: ${{ steps.paths.outputs.ninja_SOURCE }}

build/fbcode_builder/manifests/glog

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ HAVE_TR1_UNORDERED_SET=OFF
2424
[homebrew]
2525
glog
2626

27-
# on ubuntu glog brings in liblzma-dev, which in turn breaks watchman tests
28-
[debs.not(distro=ubuntu)]
27+
[debs]
2928
libgoogle-glog-dev
3029

3130
[rpms.distro=fedora]

build/fbcode_builder/manifests/libunwind

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ name = libunwind
55
libunwind-devel
66
libunwind
77

8-
# on ubuntu this brings in liblzma-dev, which in turn breaks watchman tests
9-
[debs.not(distro=ubuntu)]
8+
[debs]
109
libunwind-dev
1110

1211
# The current libunwind v1.8.1 release has compiler issues with aarch64 (https://github.com/libunwind/libunwind/issues/702).

build/fbcode_builder/manifests/watchman

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ pcre2
2121
googletest
2222
python-setuptools
2323

24+
[dependencies.os=linux]
25+
bz2
26+
2427
[dependencies.fbsource=on]
2528
rust
2629

build/fbcode_builder/manifests/xz

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
[manifest]
22
name = xz
33

4-
# ubuntu's package causes watchman's tests to hang
5-
[debs.not(distro=ubuntu)]
4+
[debs]
65
liblzma-dev
76

87
[homebrew]

0 commit comments

Comments
 (0)