Merge pull request #157 from txtsd/actions_fix

Adjust OpenSSL step
This commit is contained in:
txtsd 2022-02-12 03:15:11 -08:00 committed by GitHub
commit 2f6973e08b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -43,6 +43,11 @@ jobs:
run: | run: |
choco install strawberryperl -y --force --x86 choco install strawberryperl -y --force --x86
- name: Checkout
uses: actions/checkout@v2
with:
submodules: 'true'
# We need to do this here because it inexplicably fails if we split the step # We need to do this here because it inexplicably fails if we split the step
- name: Download and install OpenSSL libs on Windows - name: Download and install OpenSSL libs on Windows
if: runner.os == 'Windows' if: runner.os == 'Windows'
@ -54,11 +59,6 @@ jobs:
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\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 }}\" copy "${{ github.workspace }}\Qt\Tools\OpenSSL\Win_x86\bin\libcrypto-1_1.dll" "${{ github.workspace }}\${{ env.INSTALL_DIR }}\"
- name: Checkout
uses: actions/checkout@v2
with:
submodules: 'true'
- name: Install OpenJDK - name: Install OpenJDK
uses: AdoptOpenJDK/install-jdk@v1 uses: AdoptOpenJDK/install-jdk@v1
with: with: