1
0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2026-06-20 01:17:49 +02:00

Add MacOS back to CirrusCI.

9e29c01 removed MacOS testing due to breaking changes in the update to arm on the platform.

Update the scripts to correctly work with the version of Homebrew deployed with the arm images.
This commit is contained in:
David Steele
2023-04-21 16:21:10 +03:00
parent 23d7d67d49
commit 750ab8e55c
+16 -16
View File
@@ -60,24 +60,24 @@ freebsd_13_task:
debug_script:
- ls -lah ${CIRRUS_WORKING_DIR}
# MacOS Monterey
# MacOS Ventura
# ----------------------------------------------------------------------------------------------------------------------------------
# macos_monterey_task:
# osx_instance:
# image: monterey-xcode
macos_ventura_task:
osx_instance:
image: ghcr.io/cirruslabs/macos-ventura-base:latest
# environment:
# LDFLAGS: -L/usr/local/opt/openssl@1.1/lib -L/usr/local/opt/libpq/lib -L/usr/local/opt/libxml2/lib -L/usr/local/opt/libyaml/lib
# CPPFLAGS: -I/usr/local/opt/openssl@1.1/include -I/usr/local/opt/libpq/include -I/usr/local/opt/libxml2/include/libxml2 -I/usr/local/opt/libyaml/include
# PERL5LIB: /usr/local/opt/perl5/lib/perl5
# PKG_CONFIG_PATH: /usr/local/opt/libpq/lib/pkgconfig:/usr/local/opt/openssl@1.1/lib/pkgconfig
environment:
LDFLAGS: -L/opt/homebrew/opt/openssl@1.1/lib -L/opt/homebrew/opt/libpq/lib -L/opt/homebrew/opt/libxml2/lib -L/opt/homebrew/opt/libyaml/lib
CPPFLAGS: -I/opt/homebrew/opt/openssl@1.1/include -I/opt/homebrew/opt/libpq/include -I/opt/homebrew/opt/libxml2/include/libxml2 -I/opt/homebrew/opt/libyaml/include
PERL5LIB: /opt/homebrew/opt/perl5/lib/perl5
PKG_CONFIG_PATH: /opt/homebrew/opt/libpq/lib/pkgconfig:/opt/homebrew/opt/openssl@1.1/lib/pkgconfig
# install_script:
# - brew install -q pkg-config openssl@1.1 libpq libxml2 libyaml cpanm meson
# - cpanm --local-lib=/usr/local/opt/perl5 install YAML::XS
install_script:
- brew install -q pkg-config openssl@1.1 libpq libxml2 libyaml meson
# script:
# - cd .. && ${CIRRUS_WORKING_DIR}/test/test.pl --min-gen --vm=none --vm-max=2 --no-coverage --no-valgrind --module=command --test=backup
script:
- cd .. && ${CIRRUS_WORKING_DIR}/test/test.pl --min-gen --vm=none --vm-max=2 --no-coverage --no-valgrind --module=command --test=backup
# debug_script:
# - ls -lah ${CIRRUS_WORKING_DIR}
debug_script:
- ls -lah ${CIRRUS_WORKING_DIR}
- ls -lahR /opt/homebrew/opt