diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eebb07b..0b00d04 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,10 +28,10 @@ cache: - /usr/local/rustup/update-hashes/ - target/ -# Install compiler and OpenSSL dependencies +# Install compiler dependencies before_script: - apt-get update - - apt-get install -y --no-install-recommends build-essential pkg-config libssl-dev + - apt-get install -y --no-install-recommends build-essential pkg-config - | rustup install $RUST_VERSION rustup default $RUST_VERSION diff --git a/.travis.yml b/.travis.yml index 0343d4a..ecfb02e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,13 +10,6 @@ stages: - name: release if: tag =~ ^v(\d+\.)*\d+$ -# Explicitly install and update OpenSSL dependencies -addons: - homebrew: - packages: - - openssl@1.1 - update: true - jobs: include: - stage: release diff --git a/appveyor.yml b/appveyor.yml index 6271eeb..e49b58d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,6 @@ branches: # Build for the x86_64 Windows target platform: x64 environment: - SSL_CERT_FILE: "C:\\OpenSSL\\cacert.pem" RUSTUP_USE_HYPER: 1 CARGO_HTTP_CHECK_REVOKE: false GITHUB_TOKEN: @@ -23,23 +22,14 @@ environment: matrix: - TARGET: x86_64-pc-windows-msvc BITS: 64 - OPENSSL_VERSION: 1_1_0L - OPENSSL_DIR: C:\OpenSSL # Extract release binary artifacts artifacts: - path: .\ffsend*.exe - path: .\ffsend.*.nupkg -# Install dependencies: Rust and OpenSSL +# Install dependencies: Rust install: - # Install OpenSSL - - mkdir C:\OpenSSL - - ps: if (Test-Path env:OPENSSL_VERSION) { Start-FileDownload "http://slproweb.com/download/Win${env:BITS}OpenSSL-${env:OPENSSL_VERSION}.exe" } - - if defined OPENSSL_VERSION Win%BITS%OpenSSL-%OPENSSL_VERSION%.exe /SILENT /VERYSILENT /SP- /DIR="C:\OpenSSL" - - appveyor DownloadFile https://curl.haxx.se/ca/cacert.pem -FileName C:\OpenSSL\cacert.pem - - choco install openssl.light --version 1.1.0.80000000 -y -f - # Install Rust - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe - rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain stable