Update macos

This commit is contained in:
Andrea Cavalli 2023-04-26 17:15:47 +02:00
parent d75c49e38c
commit 3b9bbce2fb
2 changed files with 3 additions and 2 deletions

View File

@ -22,7 +22,7 @@ jobs:
- {os: ubuntu-22.04, usedocker: "false", ssl: "ssl3", useqemu: "false", arch: "linux/amd64", implementation: "tdlight"} - {os: ubuntu-22.04, usedocker: "false", ssl: "ssl3", useqemu: "false", arch: "linux/amd64", implementation: "tdlight"}
- {os: ubuntu-22.04, usedocker: "false", ssl: "ssl3", useqemu: "false", arch: "linux/arm64", implementation: "tdlight"} - {os: ubuntu-22.04, usedocker: "false", ssl: "ssl3", useqemu: "false", arch: "linux/arm64", implementation: "tdlight"}
- {os: windows-2019, usedocker: "false", ssl: "ssl1", useqemu: "false", arch: "amd64", implementation: "tdlight", vcpkgCommitId: "6ca56aeb457f033d344a7106cb3f9f1abf8f4e98", triplet: "x64-windows-static"} - {os: windows-2019, usedocker: "false", ssl: "ssl1", useqemu: "false", arch: "amd64", implementation: "tdlight", vcpkgCommitId: "6ca56aeb457f033d344a7106cb3f9f1abf8f4e98", triplet: "x64-windows-static"}
- {os: macos-11, usedocker: "false", ssl: "ssl1", useqemu: "false", arch: "amd64", implementation: "tdlight"} - {os: macos-12, usedocker: "false", ssl: "ssl1", useqemu: "false", arch: "amd64", implementation: "tdlight"}
steps: steps:
- name: Checkout current repo - name: Checkout current repo
uses: actions/checkout@v2 uses: actions/checkout@v2

View File

@ -10,9 +10,10 @@ if [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then
elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then
echo "==OSX======" echo "==OSX======"
brew update
brew install gperf cmake openssl coreutils brew install gperf cmake openssl coreutils
brew install libtiff
brew install openjdk brew install openjdk
brew install freetype gd libtiff
elif [[ "$OPERATING_SYSTEM_NAME" == "windows" ]]; then elif [[ "$OPERATING_SYSTEM_NAME" == "windows" ]]; then
echo "==Windows==" echo "==Windows=="
#choco install visualstudio2019buildtools --version=16.10.4.0 --allow-downgrade --package-parameters "--passive" #choco install visualstudio2019buildtools --version=16.10.4.0 --allow-downgrade --package-parameters "--passive"