From e9facb1a54165109d537659e6a869a848303f423 Mon Sep 17 00:00:00 2001 From: Niklas Adolfsson Date: Tue, 12 Nov 2019 14:19:09 +0100 Subject: [PATCH 1/4] fix libsusb on Windows --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 3fa3b744041..1e00aff4d7f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2283,7 +2283,7 @@ dependencies = [ [[package]] name = "libusb-sys" version = "0.2.5" -source = "git+https://github.com/paritytech/libusb-sys#79e570b00379e1550fb728f2fbd2a083dc99bda6" +source = "git+https://github.com/paritytech/libusb-sys#480f3c87bfc81b5b5f78bcfbe01aaaa491c6a73a" dependencies = [ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", From 0fb933707e9c9c4a7c98461aaa2a2fa0c27de046 Mon Sep 17 00:00:00 2001 From: Martin Pugh Date: Tue, 12 Nov 2019 14:50:49 +0100 Subject: [PATCH 2/4] Force building on windows for testing --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f2a3c3e0b4..a45d02d13e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -188,7 +188,8 @@ build-darwin: build-windows: stage: build <<: *collect_artifacts - only: *releaseable_branches + only: + - na-stable-libusb variables: CARGO_TARGET: x86_64-pc-windows-msvc CARGO_HOME: "C:/ci-cache/parity-ethereum/cargo/$CI_JOB_NAME" From e0b478f6e8088d9ffc61daae4347dea27a4fafd0 Mon Sep 17 00:00:00 2001 From: Martin Pugh Date: Tue, 12 Nov 2019 16:14:47 +0100 Subject: [PATCH 3/4] Revert "Force building on windows for testing" This reverts commit 0fb933707e9c9c4a7c98461aaa2a2fa0c27de046. --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a45d02d13e6..2f2a3c3e0b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -188,8 +188,7 @@ build-darwin: build-windows: stage: build <<: *collect_artifacts - only: - - na-stable-libusb + only: *releaseable_branches variables: CARGO_TARGET: x86_64-pc-windows-msvc CARGO_HOME: "C:/ci-cache/parity-ethereum/cargo/$CI_JOB_NAME" From e9cbad191d01c5f0a9f6ca884c7bd8bfc07b4134 Mon Sep 17 00:00:00 2001 From: Martin Pugh Date: Tue, 12 Nov 2019 16:31:01 +0100 Subject: [PATCH 4/4] fix libsusb on Windows (after merge with master) --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 1e00aff4d7f..56fa3601947 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2283,7 +2283,7 @@ dependencies = [ [[package]] name = "libusb-sys" version = "0.2.5" -source = "git+https://github.com/paritytech/libusb-sys#480f3c87bfc81b5b5f78bcfbe01aaaa491c6a73a" +source = "git+https://github.com/paritytech/libusb-sys#f49d8fc7ca43a465c721c8eafc37c86fd06f795f" dependencies = [ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",