From c0ab9331525e2bd019953a2a9e7052a15ad6217d Mon Sep 17 00:00:00 2001 From: Diego Ongaro Date: Wed, 31 Jan 2024 20:10:39 -0800 Subject: [PATCH] CI: Try installing openssl separately --- .github/workflows/main.yaml | 4 +++- src/bin/gen_github_yaml.rs | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 5bea909..32deac6 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -186,7 +186,9 @@ jobs: - name: Install Docker run: brew install docker - name: Install Colima - run: brew install --overwrite colima + run: | + brew install --overwrite openssl@3 + brew install colima - name: Save Homebrew cache uses: actions/cache/save@v3 with: diff --git a/src/bin/gen_github_yaml.rs b/src/bin/gen_github_yaml.rs index eae0bda..5cf6fe0 100644 --- a/src/bin/gen_github_yaml.rs +++ b/src/bin/gen_github_yaml.rs @@ -650,7 +650,10 @@ fn docker_mac_install_steps(os: Os) -> Vec { // install or upgrade openssl to version 3, which conflicts // with version 1.1. They fight over the symlink // `/usr/local/bin/openssl`. - run: s("brew install --overwrite colima"), + run: s(indoc! {" + brew install --overwrite openssl@3 + brew install colima + "}), }, env: dict! {}, },