Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix macOS CI. #11503

Merged
merged 1 commit into from
Jan 23, 2024
Merged

Fix macOS CI. #11503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 3 additions & 10 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,23 +616,16 @@ jobs:
- name: Install dependencies
env:
# For compatibility with macOS 10.13
ZLIB_VERSION: 1.3
ZLIB_VERSION: 1.3.1
MBEDTLS_VERSION: 2.28.5
PCRE2_VERSION: 10.42
run: |
set -ex
brew uninstall openssl@1.0.2t || echo
brew uninstall python@2.7.17 || echo
brew untap local/openssl || echo
brew untap local/python2 || echo
brew update
# brew unlink python@2
brew bundle --file=tests/Brewfile --no-upgrade || brew link --overwrite awscli
brew install libunistring
brew install cpanminus
brew bundle --file=tests/Brewfile --no-upgrade
cpanm IPC::System::Simple
cpanm String::ShellQuote
curl -L https://www.zlib.net/zlib-$ZLIB_VERSION.tar.gz | tar xz
curl -L https://github.com/madler/zlib/releases/download/v$ZLIB_VERSION/zlib-$ZLIB_VERSION.tar.gz | tar xz
cd zlib-$ZLIB_VERSION
./configure
make && make install
Expand Down
13 changes: 3 additions & 10 deletions extra/github-actions/build-mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,16 @@
- name: Install dependencies
env:
# For compatibility with macOS 10.13
ZLIB_VERSION: 1.3
ZLIB_VERSION: 1.3.1
MBEDTLS_VERSION: 2.28.5
PCRE2_VERSION: 10.42
run: |
set -ex
brew uninstall openssl@1.0.2t || echo
brew uninstall python@2.7.17 || echo
brew untap local/openssl || echo
brew untap local/python2 || echo
brew update
# brew unlink python@2
brew bundle --file=tests/Brewfile --no-upgrade || brew link --overwrite awscli
brew install libunistring
brew install cpanminus
brew bundle --file=tests/Brewfile --no-upgrade
cpanm IPC::System::Simple
cpanm String::ShellQuote
curl -L https://www.zlib.net/zlib-$ZLIB_VERSION.tar.gz | tar xz
curl -L https://github.com/madler/zlib/releases/download/v$ZLIB_VERSION/zlib-$ZLIB_VERSION.tar.gz | tar xz
cd zlib-$ZLIB_VERSION
./configure
make && make install
Expand Down
7 changes: 3 additions & 4 deletions tests/Brewfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
brew "ocaml"
brew "camlp5"
brew "opam"
brew "ninja"
brew "awscli"
brew "cmake"
brew "pkg-config"
brew "pkg-config"
brew "libunistring"
brew "cpanminus"