Skip to content

Commit b0ae51d

Browse files
authored
Always add bin path to $PATH on macos builders (#19466)
* Always add bin path to $PATH on macos builders * Add a dummy change to test that a macos build with a cache hit works * Revert "Add a dummy change to test that a macos build with a cache hit works" This reverts commit 4df3963.
1 parent c4d3260 commit b0ae51d

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

.builders/build.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ def build_macos():
118118
'DD_PY2_BUILDENV_PATH': builder_root / 'py2' / 'bin' / 'python',
119119
# Path where we'll install libraries that we build
120120
'DD_PREFIX_PATH': prefix_path,
121+
'PATH': f'{prefix_path}/bin:{os.environ["PATH"]}',
121122
# Common compilation flags
122123
'LDFLAGS': f'-L{prefix_path}/lib',
123124
'CFLAGS': f'-I{prefix_path}/include -O2',

.builders/images/macos-x86_64/builder_setup.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ VERSION="16.0" \
100100
SHA256="df9e823eb22330444e1d48e52cc65135a652a6fdb3ce325e3f08549339f51b99" \
101101
RELATIVE_PATH="postgresql-{{version}}" \
102102
install-from-source --without-readline --with-openssl --without-icu
103-
# Add paths to pg_config and to the library
104-
echo PATH="${DD_PREFIX_PATH}/bin:${PATH:-}" >> $DD_ENV_FILE
105103

106104
# Dependencies needed to build librdkafka (and thus, confluent-kafka) with kerberos support
107105
DOWNLOAD_URL="https://github.com/LMDB/lmdb/archive/LMDB_{{version}}.tar.gz" \

0 commit comments

Comments
 (0)