From 4a653edacf3b553bacbdeb567da792e444510e63 Mon Sep 17 00:00:00 2001 From: Andrzej Klajnert Date: Sat, 20 Feb 2021 17:27:49 +0100 Subject: [PATCH 1/5] Show versions before build --- .github/workflows/rust.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 29381f2..dfab759 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -22,6 +22,8 @@ jobs: - name: Install dependencies run: sudo apt install libdbus-1-dev -y if: matrix.platform == 'ubuntu-latest' + - name: Show version + run: rustup show - name: Build run: cargo build --verbose - name: Run tests From da191539afd964a4dbb29ba4c6f76cb1c9fc6505 Mon Sep 17 00:00:00 2001 From: Andrzej Klajnert Date: Sat, 20 Feb 2021 17:40:40 +0100 Subject: [PATCH 2/5] Attempt to update rust --- .github/workflows/rust.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index dfab759..5c9ccc4 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -22,6 +22,9 @@ jobs: - name: Install dependencies run: sudo apt install libdbus-1-dev -y if: matrix.platform == 'ubuntu-latest' + - name: Update rust + run: rustup update + if: matrix.platform == 'windows-latest' - name: Show version run: rustup show - name: Build From f96a8d0bddcd9cbcab2cb76ea6ee7db5e10d8a44 Mon Sep 17 00:00:00 2001 From: Andrzej Klajnert Date: Sat, 20 Feb 2021 17:51:12 +0100 Subject: [PATCH 3/5] Set rust 1.49.0, use cargo-check instead of build --- .github/workflows/rust.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 5c9ccc4..850d7a6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -22,13 +22,12 @@ jobs: - name: Install dependencies run: sudo apt install libdbus-1-dev -y if: matrix.platform == 'ubuntu-latest' - - name: Update rust - run: rustup update - if: matrix.platform == 'windows-latest' + - name: Set rust version + run: rustup default 1.49.0 - name: Show version run: rustup show - - name: Build - run: cargo build --verbose + - name: Check + run: cargo check --all - name: Run tests run: cargo test --verbose - name: Lint From 52e80c7d340aa8468051bb6d4457f544b48d9281 Mon Sep 17 00:00:00 2001 From: Andrzej Klajnert Date: Sat, 20 Feb 2021 17:59:29 +0100 Subject: [PATCH 4/5] Pin winrt version on Windows --- Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 70165d8..aa31c39 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,3 +19,6 @@ btleplug = "0.6.0" failure = "0.1.8" failure_derive = "0.1.8" indicatif = "0.15.0" + +[target.'cfg(target_os = "windows")'.dependencies] +winrt = "=0.7.2" From e1199a7bb1533e194c8be4c6c70ac591f29fba95 Mon Sep 17 00:00:00 2001 From: Andrzej Klajnert Date: Sat, 20 Feb 2021 18:03:18 +0100 Subject: [PATCH 5/5] Update rust.yml --- .github/workflows/rust.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 850d7a6..29381f2 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -22,12 +22,8 @@ jobs: - name: Install dependencies run: sudo apt install libdbus-1-dev -y if: matrix.platform == 'ubuntu-latest' - - name: Set rust version - run: rustup default 1.49.0 - - name: Show version - run: rustup show - - name: Check - run: cargo check --all + - name: Build + run: cargo build --verbose - name: Run tests run: cargo test --verbose - name: Lint