From 9440b05e08d5ddd2965c296f0037cc12b7c12b6a Mon Sep 17 00:00:00 2001 From: Saul Gutierrez Date: Tue, 28 Feb 2023 14:40:02 -0800 Subject: [PATCH] ci: downgrade openssl from 1.1.1t to 1.1.1s Summary: After upgrading openssl along with Python in D43640261 (https://github.com/facebook/sapling/commit/b671ca71f4c037058a561a94a5c575d38b397fe2), I broke the build since it doesn't match the openssl version that GitHub actions has. This commit downgrades the version for fixing the build Reviewed By: zzl0 Differential Revision: D43675103 fbshipit-source-id: 11754aab77a086770b3c6a20fd5b09203a4515cb --- .../workflows/sapling-cli-homebrew-macos-arm64-release.yml | 2 +- .github/workflows/sapling-cli-homebrew-macos-x86-release.yml | 2 +- ci/gen_workflows.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sapling-cli-homebrew-macos-arm64-release.yml b/.github/workflows/sapling-cli-homebrew-macos-arm64-release.yml index 5e83b5ac25ee9..9ab3c67bf173b 100644 --- a/.github/workflows/sapling-cli-homebrew-macos-arm64-release.yml +++ b/.github/workflows/sapling-cli-homebrew-macos-arm64-release.yml @@ -19,7 +19,7 @@ jobs: - name: Prepare build environment run: 'eden/scm/packaging/mac/prepare_environment.py \ - -s 524ec08838d2826793e26b2ed084efdefec931e1aaa6dea01455aa77409b86c8 -f openssl@1.1 \ + -s c11b17c8b78efa46dac2d213cd7a7b3fff75f6f5e6d2ef2248345cd4a900b1c6 -f openssl@1.1 \ -s cde36624e734632be009e3aa28d9bd07f4fa681c7caa270e7efb416b287c1e72 -f python@3.11 \ diff --git a/.github/workflows/sapling-cli-homebrew-macos-x86-release.yml b/.github/workflows/sapling-cli-homebrew-macos-x86-release.yml index 35cc086cb4767..0b7a3a8d628db 100644 --- a/.github/workflows/sapling-cli-homebrew-macos-x86-release.yml +++ b/.github/workflows/sapling-cli-homebrew-macos-x86-release.yml @@ -19,7 +19,7 @@ jobs: - name: Prepare build environment run: 'eden/scm/packaging/mac/prepare_environment.py \ - -s 43c00851b8447bd5d1fba3e8140b74ca3d4a5b19343e64ec50bafae376f95454 -f openssl@1.1 \ + -s d915175bedb146e38d7a2c95e86888a60a5058a5cd21f835813d43d1372a29d9 -f openssl@1.1 \ -s 1760c64881403847ad39e6df648ff0845fab321b638715734fe0264dfe7bcbda -f python@3.11 \ diff --git a/ci/gen_workflows.py b/ci/gen_workflows.py index 2f27d12a63e06..1416f1a82bdff 100755 --- a/ci/gen_workflows.py +++ b/ci/gen_workflows.py @@ -43,12 +43,12 @@ "x86": { "target": "x86_64-apple-darwin", "python_bottle_hash": "1760c64881403847ad39e6df648ff0845fab321b638715734fe0264dfe7bcbda", - "openssl_bottle_hash": "43c00851b8447bd5d1fba3e8140b74ca3d4a5b19343e64ec50bafae376f95454", + "openssl_bottle_hash": "d915175bedb146e38d7a2c95e86888a60a5058a5cd21f835813d43d1372a29d9", }, "arm64": { "target": "aarch64-apple-darwin", "python_bottle_hash": "cde36624e734632be009e3aa28d9bd07f4fa681c7caa270e7efb416b287c1e72", - "openssl_bottle_hash": "524ec08838d2826793e26b2ed084efdefec931e1aaa6dea01455aa77409b86c8", + "openssl_bottle_hash": "c11b17c8b78efa46dac2d213cd7a7b3fff75f6f5e6d2ef2248345cd4a900b1c6", }, }