From 3b9bbce2fb416f29c9f74cd19b04482fa9efc07e Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Wed, 26 Apr 2023 17:15:47 +0200 Subject: [PATCH] Update macos --- .github/workflows/platform_natives.yaml | 2 +- .../github-workflows/install-dependencies.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/platform_natives.yaml b/.github/workflows/platform_natives.yaml index 807c2b9..db77bfa 100644 --- a/.github/workflows/platform_natives.yaml +++ b/.github/workflows/platform_natives.yaml @@ -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/arm64", implementation: "tdlight"} - {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: - name: Checkout current repo uses: actions/checkout@v2 diff --git a/scripts/continuous-integration/github-workflows/install-dependencies.sh b/scripts/continuous-integration/github-workflows/install-dependencies.sh index 67a8ff4..dbf6d06 100755 --- a/scripts/continuous-integration/github-workflows/install-dependencies.sh +++ b/scripts/continuous-integration/github-workflows/install-dependencies.sh @@ -10,9 +10,10 @@ if [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then echo "==OSX======" + brew update brew install gperf cmake openssl coreutils - brew install libtiff brew install openjdk + brew install freetype gd libtiff elif [[ "$OPERATING_SYSTEM_NAME" == "windows" ]]; then echo "==Windows==" #choco install visualstudio2019buildtools --version=16.10.4.0 --allow-downgrade --package-parameters "--passive"