aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authortxtsd <thexerothermicsclerodermoid@gmail.com>2022-02-11 21:45:00 +0530
committertxtsd <thexerothermicsclerodermoid@gmail.com>2022-02-12 00:19:11 +0530
commite97a6ef957816eb693ddf1261097d419ecfb78de (patch)
tree1991ffb9b553048e8982f7eca127132988f2d8b6 /.github
parentbcfa3246cbacb54c522275dd442429178ee363b1 (diff)
downloadPrismLauncher-e97a6ef957816eb693ddf1261097d419ecfb78de.tar.gz
PrismLauncher-e97a6ef957816eb693ddf1261097d419ecfb78de.tar.bz2
PrismLauncher-e97a6ef957816eb693ddf1261097d419ecfb78de.zip
Unsplit OpenSSL step
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build.yml12
1 files changed, 5 insertions, 7 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eda7479a..c695e0bf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,12 +43,16 @@ jobs:
run: |
choco install strawberryperl -y --force --x86
- - name: Download OpenSSL libs on Windows
+ # We need to do this here because it inexplicably fails if we split the step
+ - name: Download and install OpenSSL libs on Windows
if: runner.os == 'Windows'
run: |
python -m pip install --upgrade pip
python -m pip install aqtinstall==2.0.5
python -m aqt install-tool -O "${{ github.workspace }}\Qt\" windows desktop tools_openssl_x86
+ mkdir ${{ env.INSTALL_DIR }}
+ copy "${{ github.workspace }}\Qt\Tools\OpenSSL\Win_x86\bin\libssl-1_1.dll" "${{ github.workspace }}\${{ env.INSTALL_DIR }}\"
+ copy "${{ github.workspace }}\Qt\Tools\OpenSSL\Win_x86\bin\libcrypto-1_1.dll" "${{ github.workspace }}\${{ env.INSTALL_DIR }}\"
- name: Checkout
uses: actions/checkout@v2
@@ -143,12 +147,6 @@ jobs:
run: |
windeployqt --no-translations "${{ env.INSTALL_DIR }}/polymc.exe"
- - name: Install OpenSSL libs on Windows
- if: runner.os == 'Windows'
- run: |
- copy "${{ github.workspace }}\Qt\Tools\OpenSSL\Win_x86\bin\libssl-1_1.dll" "${{ github.workspace }}\${{ env.INSTALL_DIR }}\"
- copy "${{ github.workspace }}\Qt\Tools\OpenSSL\Win_x86\bin\libcrypto-1_1.dll" "${{ github.workspace }}\${{ env.INSTALL_DIR }}\"
-
- name: Run macdeployqt
if: runner.os == 'macOS'
run: |