Do not install OpenSSL on CI
This commit is contained in:
parent
eea76722a7
commit
3fee8854b7
3 changed files with 3 additions and 20 deletions
|
@ -28,10 +28,10 @@ cache:
|
||||||
- /usr/local/rustup/update-hashes/
|
- /usr/local/rustup/update-hashes/
|
||||||
- target/
|
- target/
|
||||||
|
|
||||||
# Install compiler and OpenSSL dependencies
|
# Install compiler dependencies
|
||||||
before_script:
|
before_script:
|
||||||
- apt-get update
|
- 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 install $RUST_VERSION
|
||||||
rustup default $RUST_VERSION
|
rustup default $RUST_VERSION
|
||||||
|
|
|
@ -10,13 +10,6 @@ stages:
|
||||||
- name: release
|
- name: release
|
||||||
if: tag =~ ^v(\d+\.)*\d+$
|
if: tag =~ ^v(\d+\.)*\d+$
|
||||||
|
|
||||||
# Explicitly install and update OpenSSL dependencies
|
|
||||||
addons:
|
|
||||||
homebrew:
|
|
||||||
packages:
|
|
||||||
- openssl@1.1
|
|
||||||
update: true
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
include:
|
include:
|
||||||
- stage: release
|
- stage: release
|
||||||
|
|
12
appveyor.yml
12
appveyor.yml
|
@ -12,7 +12,6 @@ branches:
|
||||||
# Build for the x86_64 Windows target
|
# Build for the x86_64 Windows target
|
||||||
platform: x64
|
platform: x64
|
||||||
environment:
|
environment:
|
||||||
SSL_CERT_FILE: "C:\\OpenSSL\\cacert.pem"
|
|
||||||
RUSTUP_USE_HYPER: 1
|
RUSTUP_USE_HYPER: 1
|
||||||
CARGO_HTTP_CHECK_REVOKE: false
|
CARGO_HTTP_CHECK_REVOKE: false
|
||||||
GITHUB_TOKEN:
|
GITHUB_TOKEN:
|
||||||
|
@ -23,23 +22,14 @@ environment:
|
||||||
matrix:
|
matrix:
|
||||||
- TARGET: x86_64-pc-windows-msvc
|
- TARGET: x86_64-pc-windows-msvc
|
||||||
BITS: 64
|
BITS: 64
|
||||||
OPENSSL_VERSION: 1_1_0L
|
|
||||||
OPENSSL_DIR: C:\OpenSSL
|
|
||||||
|
|
||||||
# Extract release binary artifacts
|
# Extract release binary artifacts
|
||||||
artifacts:
|
artifacts:
|
||||||
- path: .\ffsend*.exe
|
- path: .\ffsend*.exe
|
||||||
- path: .\ffsend.*.nupkg
|
- path: .\ffsend.*.nupkg
|
||||||
|
|
||||||
# Install dependencies: Rust and OpenSSL
|
# Install dependencies: Rust
|
||||||
install:
|
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
|
# Install Rust
|
||||||
- appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
|
- 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
|
- rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain stable
|
||||||
|
|
Loading…
Reference in a new issue