diff --git a/build/fbcode_builder/manifests/python b/build/fbcode_builder/manifests/python index 00fed973ca95b..97f4f2683e3ca 100644 --- a/build/fbcode_builder/manifests/python +++ b/build/fbcode_builder/manifests/python @@ -2,7 +2,9 @@ name = python [homebrew] -python@3.8 +# python 3.12 on brew doesn't install all the symlinks. +# 3.13 does but our pyo3 is too old for it +python@3.11 [rpms] python3 diff --git a/build/fbcode_builder/manifests/sapling b/build/fbcode_builder/manifests/sapling index c067360ef82ba..cff882c67c87a 100644 --- a/build/fbcode_builder/manifests/sapling +++ b/build/fbcode_builder/manifests/sapling @@ -60,7 +60,7 @@ fb303 fbthrift rust-shed -[dependencies.test=on] +[dependencies.all(test=on,not(os=darwin))] hexdump [dependencies.not(os=windows)] diff --git a/eden/scm/Makefile b/eden/scm/Makefile index 4e04cfdffee52..5ca08b90f792a 100644 --- a/eden/scm/Makefile +++ b/eden/scm/Makefile @@ -68,7 +68,7 @@ COMPILERFLAG_tmp_${COMPILER} ?= -c $(COMPILER) COMPILERFLAG=${COMPILERFLAG_tmp_${COMPILER}} MAKE_PID := $(shell echo $$PPID) -JOBS := $(shell ps T | sed -n 's%.*$(MAKE_PID).*$(MAKE).* \(-j\|--jobs=\) *\([0-9][0-9]*\).*%\2%p') +JOBS := $(shell ps T | sed -n -Ee 's%.*$(MAKE_PID).*$(MAKE).* (-j|--jobs=) *([0-9][0-9]*).*%\2%p') # Mac Big Sur doesn't find the standard library without this. export SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk @@ -259,7 +259,6 @@ test-getdeps: fi; \ $$PYTHON_SYS_EXECUTABLE run-tests.py -j $(JOBS) --getdeps-build --with-hg="$(PREFIX)/bin/$(HGNAME)" $$GETDEPS_TEST_FILTER; \ status=$$?; \ - # stop if all good \ if [ $$status = 0 ]; then echo "passed on try $$try"; exit 0; fi; \ done; \ exit $$status