From f870bd2619f9a7a3987c86934ad7aa8bc7f099d8 Mon Sep 17 00:00:00 2001 From: Patrick Siegler Date: Sun, 6 Aug 2023 22:32:54 +0200 Subject: [PATCH 1/2] Install OpenSSL 1.1 to stay in sync with Qt 5.15 We don't want to deploy two versions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 708cdfdf..fe226df1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,7 +103,7 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive - - run: choco install --no-progress openssl + - run: choco install --no-progress openssl --version=1.1.1.2100 - uses: ilammy/msvc-dev-cmd@v1 - name: Install Qt uses: jurplel/install-qt-action@v3 From e88e063bddb976f74acb34f02fe9b6e62bd99419 Mon Sep 17 00:00:00 2001 From: Patrick Siegler Date: Sun, 6 Aug 2023 22:52:23 +0200 Subject: [PATCH 2/2] Stick to old UpdateElevate that doesn't use 3.x headers while we stay with 1.1.x --- Software/UpdateElevate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Software/UpdateElevate b/Software/UpdateElevate index 5b6333aa..75a3e3e1 160000 --- a/Software/UpdateElevate +++ b/Software/UpdateElevate @@ -1 +1 @@ -Subproject commit 5b6333aabf1cdbb7cf0b8b8957ea38aa4ba62181 +Subproject commit 75a3e3e184cbad27c499fcdd5a8e852f0f93316d