diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eda7479a..d2ccc59e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,17 +43,21 @@ jobs: run: | choco install strawberryperl -y --force --x86 - - name: Download OpenSSL libs on Windows + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: 'true' + + # 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 - - - name: Checkout - uses: actions/checkout@v2 - with: - submodules: 'true' + 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: Install OpenJDK uses: AdoptOpenJDK/install-jdk@v1 @@ -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: | |