469: Fix (windows) build r=koivunej a=koivunej

The old vcpkg commit `ffa41582f78478812c836a6e8ce315fb27431182` has started segfaulting for some unknown reason. This PR:

1. updates run-vcpkg, openssl-sys, openssl along with vcpkg revision `261c458af6e3eed5d099144aff95d2b5035f656b`
2. disables CI on mobile platforms for now
3. allows rustfmt and clippy to fail

(2) is to save CI seconds until we know better; when this was decided previously CI seconds were practically unlimited; we'll need another decision on that. I don't think anyone is using the android build for example yet.

(3) will follow up with another PR to handle these.

Co-authored-by: Joonas Koivunen <joonas.koivunen@gmail.com>
This commit is contained in:
bors[bot] 2021-08-02 12:03:25 +00:00 committed by GitHub
commit 7ab0939886
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 22 deletions

View File

@ -29,21 +29,25 @@ jobs:
host: windows-latest
cross: false
- target: armv7-linux-androideabi
host: ubuntu-latest
cross: true
- target: aarch64-linux-android
host: ubuntu-latest
cross: true
- target: x86_64-apple-ios
host: macos-latest
cross: true
- target: aarch64-apple-ios
host: macos-latest
cross: true
# Mobile platforms disabled until we get a good estimate of them being
# needed. Previous discussion to enable them was before github CI usage
# was metered.
#
# - target: armv7-linux-androideabi
# host: ubuntu-latest
# cross: true
#
# - target: aarch64-linux-android
# host: ubuntu-latest
# cross: true
#
# - target: x86_64-apple-ios
# host: macos-latest
# cross: true
#
# - target: aarch64-apple-ios
# host: macos-latest
# cross: true
env:
RUST_BACKTRACE: 1
@ -97,14 +101,14 @@ jobs:
tar -xf go_ipfs.tar.gz
- name: Install dependencies windows (openssl)
uses: lukka/run-vcpkg@v4.1
uses: lukka/run-vcpkg@v7.4
id: windows-runvcpkg
if: matrix.platform.host == 'windows-latest'
with:
vcpkgDirectory: '${{ runner.workspace }}/vcpkg'
vcpkgTriplet: 'x64-windows'
vcpkgArguments: 'openssl'
vcpkgGitCommitId: 'ffa41582f78478812c836a6e8ce315fb27431182' # ok for openssl-sys v0.9.58
vcpkgGitCommitId: '261c458af6e3eed5d099144aff95d2b5035f656b' # unknown for openssl-sys v0.9.65
- name: Install rust toolchain
uses: hecrj/setup-rust-action@v1.3.4
@ -189,9 +193,11 @@ jobs:
- name: cargo fmt
run: cargo fmt --all -- --check
continue-on-error: true # will just nag until we are up to clippy changes
- name: cargo clippy
run: cargo clippy --all-targets --workspace -- -D warnings
continue-on-error: true # will just nag until we are up to clippy changes
# adapted from https://github.com/taiki-e/pin-project/blob/5878410863f5f25e21f7cba97b035501749850f9/.github/workflows/ci.yml#L136-L167
# further enchanced following solutions to

12
Cargo.lock generated
View File

@ -1,5 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "aead"
version = "0.3.2"
@ -1929,23 +1931,23 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl"
version = "0.10.32"
version = "0.10.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70"
checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885"
dependencies = [
"bitflags",
"cfg-if 1.0.0",
"foreign-types",
"lazy_static",
"libc",
"once_cell",
"openssl-sys",
]
[[package]]
name = "openssl-sys"
version = "0.9.60"
version = "0.9.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6"
checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d"
dependencies = [
"autocfg",
"cc",