diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1dd50e..d308364 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,14 +26,9 @@ jobs: mkdir -p build if [ "$RUNNER_OS" == "macOS" ]; then brew install openssl - elif [ "$RUNNER_OS" == "Windows" ]; then - cd build - curl https://mirror.firedaemon.com/OpenSSL/openssl-1.1.1e-dev.zip -O - 7z x openssl-1.1.1e-dev.zip fi - - name: Configure (nix) - if: runner.os != 'Windows' + - name: Configure shell: bash run: | if [ "$RUNNER_OS" == "macOS" ]; then @@ -41,11 +36,6 @@ jobs: fi cd build && cmake ${SSL_OPTS} ${{matrix.build-opts}} .. - - name: Configure (win) - if: runner.os == 'Windows' - # cmake in windows bash can't find openssl. so we use windows cli. - run: cd build; cmake ${{matrix.build-opts}} -D OPENSSL_ROOT_DIR="$pwd\openssl-1.1\x64" .. - - name: Build shell: bash run: cmake --build build diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index fecd67b..18c0e6b 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -43,14 +43,6 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Dependancies - shell: bash - run: | - mkdir -p build - cd build - curl https://mirror.firedaemon.com/OpenSSL/openssl-1.1.1e-dev.zip -O - 7z x openssl-1.1.1e-dev.zip - - name: Configure run: | if ("${{matrix.arch}}" -eq "x86") {