Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
test:
name: ${{ matrix.os }} - PostgreSQL ${{ matrix.postgresql-version }}
runs-on: ${{ matrix.os }}-latest
timeout-minutes: 15
timeout-minutes: ${{ matrix.os == 'macos' && 30 || 15 }}
strategy:
fail-fast: false
matrix:
Expand All @@ -41,6 +41,7 @@ jobs:
- ubuntu
postgresql-version:
- "15"
- "16"
steps:
- uses: actions/checkout@v4
- name: Prepare
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/verify-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
- ubuntu
postgresql-version:
- "15"
- "16"
steps:
- uses: actions/checkout@v4
- name: Prepare
Expand Down
3 changes: 2 additions & 1 deletion Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
# under the License.

brew "apache-arrow-glib"
brew "gobject-introspection"
brew "libpq"
brew "meson"
brew "gobject-introspection"
brew "openssl@3"
brew "postgresql@15"
2 changes: 1 addition & 1 deletion ci/scripts/prepare-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ sed \
-e "s/postgresql@[0-9]*/postgresql@${postgresql_version}/g" \
Brewfile
brew update
brew bundle
brew bundle --verbose
echo "$(brew --prefix postgresql@${postgresql_version})/bin" >> "${GITHUB_PATH}"
9 changes: 8 additions & 1 deletion dev/prepare-tls.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ root_name=$1
server_name=$2
client_name=$3

if [ "$(uname)" = "Darwin" ]; then
PATH="$(brew --prefix openssl@3)/bin:${PATH}"
extfile="$(brew --prefix)/etc/openssl@3/openssl.cnf"
else
extfile=/etc/ssl/openssl.cnf
fi

openssl req \
-addext "subjectAltName = DNS:${root_name}" \
-keyout root.key \
Expand All @@ -43,7 +50,7 @@ openssl x509 \
-copy_extensions copy \
-days 3650 \
-extensions v3_ca \
-extfile /etc/ssl/openssl.cnf \
-extfile ${extfile} \
-in root.csr \
-out root.crt \
-req \
Expand Down
1 change: 1 addition & 0 deletions dev/release/verify-rc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ test_source_distribution() {
fi
fi

rm -rf build
meson setup \
--prefix="${ARROW_TMPDIR}/install" \
-Dpostgresql_dir="$(pg_config --bindir)/.." \
Expand Down
9 changes: 7 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,25 @@ postgresql = declare_dependency(
]
)
install_dir = run_command(pg_config, '--pkglibdir', check: true).stdout().strip()
name_suffix = 'so'
if host_machine.system() == 'darwin' and \
pg_config.version().version_compare('>= 16')
name_suffix = 'dylib'
endif
afs = shared_module(
'arrow_flight_sql',
'src/afs.cc',
dependencies: [arrow_flight_sql, postgresql],
name_prefix: '',
name_suffix: 'so',
name_suffix: name_suffix,
install: true,
install_dir: install_dir,
)

install_data(
'LICENSE.txt',
'NOTICE.txt',
# 'README.md',
'README.md',
install_dir: project_doc_dir
)

Expand Down