From de446223ed1a1266d3bde359ef3735a0f387994a Mon Sep 17 00:00:00 2001 From: Jake Deichert Date: Sun, 26 Apr 2020 12:49:14 -0400 Subject: [PATCH 1/3] Re-add formatting which was accidentally removed --- .github/workflows/ci.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd8540a..73223a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,13 +39,20 @@ jobs: - name: Make mask available globally (windows) run: copy ./target/debug/mask.exe ~/.cargo/bin/ if: matrix.platform == 'windows-latest' - - name: Make mask available globally (linux) - run: cp ./target/debug/mask ~/.cargo/bin + - name: Make mask available globally (linux) + run: cp ./target/debug/mask ~/.cargo/bin if: matrix.platform == 'ubuntu-latest' - - name: Make mask available globally (mac) - run: cp ./target/debug/mask ~/.cargo/bin + - name: Make mask available globally (mac) + run: cp ./target/debug/mask ~/.cargo/bin if: matrix.platform == 'macos-latest' - - name: Run tests - run: cargo test --frozen - + - name: Run tests + run: cargo test --frozen + format: + name: Format + runs-on: ubuntu-latest + steps: + - name: Checkout master + uses: actions/checkout@master + - name: Verify formatting is correct + run: cargo fmt --all -- --check From 23f78f31ac45c5e35b6d30473beed1953864870f Mon Sep 17 00:00:00 2001 From: Jake Deichert Date: Sun, 26 Apr 2020 12:51:56 -0400 Subject: [PATCH 2/3] Whoops, indenting was already correct --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 73223a3..41344cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,14 +39,14 @@ jobs: - name: Make mask available globally (windows) run: copy ./target/debug/mask.exe ~/.cargo/bin/ if: matrix.platform == 'windows-latest' - - name: Make mask available globally (linux) - run: cp ./target/debug/mask ~/.cargo/bin + - name: Make mask available globally (linux) + run: cp ./target/debug/mask ~/.cargo/bin if: matrix.platform == 'ubuntu-latest' - - name: Make mask available globally (mac) - run: cp ./target/debug/mask ~/.cargo/bin + - name: Make mask available globally (mac) + run: cp ./target/debug/mask ~/.cargo/bin if: matrix.platform == 'macos-latest' - - name: Run tests - run: cargo test --frozen + - name: Run tests + run: cargo test --frozen format: name: Format From 1495510f431bdf2bf5cc4842cbdeabbcae9b1bc2 Mon Sep 17 00:00:00 2001 From: Jake Deichert Date: Sun, 26 Apr 2020 12:57:57 -0400 Subject: [PATCH 3/3] Try even simpler case --- .github/workflows/ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41344cc..08a248e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,12 +39,9 @@ jobs: - name: Make mask available globally (windows) run: copy ./target/debug/mask.exe ~/.cargo/bin/ if: matrix.platform == 'windows-latest' - - name: Make mask available globally (linux) + - name: Make mask available globally (linux / mac) run: cp ./target/debug/mask ~/.cargo/bin - if: matrix.platform == 'ubuntu-latest' - - name: Make mask available globally (mac) - run: cp ./target/debug/mask ~/.cargo/bin - if: matrix.platform == 'macos-latest' + if: matrix.platform != 'windows-latest' - name: Run tests run: cargo test --frozen