From d0f9e184abfb4016ccd94fc3bc27512cae2d8471 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Fri, 16 Feb 2024 21:26:37 -0500 Subject: [PATCH 1/2] Update cargo perl-core is added for building OpenSSL v3 See https://github.com/openssl/openssl/blob/openssl-3.2.1/NOTES-PERL.md --- src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile | 1 + src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 1 + src/tools/cargo | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile index f5274104d60ac..1704bef1e4ed0 100644 --- a/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile @@ -25,6 +25,7 @@ RUN yum upgrade -y && \ openssl-devel \ patch \ perl \ + perl-core \ pkgconfig \ python3 \ unzip \ diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile index 9a2fcb0ce0a1a..fe84c23a11c14 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile @@ -25,6 +25,7 @@ RUN yum upgrade -y && \ openssl-devel \ patch \ perl \ + perl-core \ pkgconfig \ python3 \ unzip \ diff --git a/src/tools/cargo b/src/tools/cargo index fc1d58fd0531a..9090349adc88e 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit fc1d58fd0531a57a6b942a14cdcdbcb82ece16f3 +Subproject commit 9090349adc88e0fcae2644c2cceb830124a10d5d From c0a11cc1385387a55ff30a05b1c51fd6918a2884 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Sat, 17 Feb 2024 09:34:29 -0500 Subject: [PATCH 2/2] [DONT MERGE] test OpenSSL v3 build --- .github/workflows/ci.yml | 3 +++ src/ci/github-actions/ci.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f95551d679b98..00cea1bbde487 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -589,6 +589,9 @@ jobs: env: CODEGEN_BACKENDS: "llvm,cranelift" os: ubuntu-20.04-16core-64gb + - name: dist-i686-linux + os: ubuntu-20.04-8core-32gb + env: {} timeout-minutes: 600 runs-on: "${{ matrix.os }}" steps: diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 9b0f477409a93..4f3fdf437810a 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -739,6 +739,8 @@ jobs: env: CODEGEN_BACKENDS: llvm,cranelift <<: *job-linux-16c + - name: dist-i686-linux + <<: *job-linux-8c master: