From 4489250a32a1c32aee91c7939bfe630840edd216 Mon Sep 17 00:00:00 2001 From: Austin Johnson Date: Mon, 19 Dec 2022 13:58:11 -0600 Subject: [PATCH 1/4] Remove python3 install. Install ninja with pip. --- .github/workflows/rust.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ff8199d687..03ff592217 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -18,13 +18,7 @@ jobs: runs-on: windows-latest steps: - name: Ninja Install - uses: crazy-max/ghaction-chocolatey@v2 - with: - args: install ninja - - name: Python3 Install - uses: crazy-max/ghaction-chocolatey@v2 - with: - args: install python3 --params "/InstallAllUsers" + run: pip install ninja - uses: actions/checkout@v3 - name: Build run: cargo build --verbose From 999eaaa2dced55bb336c131f44e3b6a0e359ae59 Mon Sep 17 00:00:00 2001 From: Austin Johnson Date: Mon, 19 Dec 2022 13:59:47 -0600 Subject: [PATCH 2/4] Run actions on all branches. --- .github/workflows/rust.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 03ff592217..15b2d2caff 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -2,11 +2,9 @@ name: Rust on: push: - branches: [ master ] paths-ignore: - '**.md' pull_request: - branches: [ master ] paths-ignore: - '**.md' From 14ecc3352e0d8f4fa59baca7549b9cfdc40fb9d7 Mon Sep 17 00:00:00 2001 From: Austin Johnson Date: Mon, 19 Dec 2022 14:28:17 -0600 Subject: [PATCH 3/4] Specify cargo jobs? --- .github/workflows/rust.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 15b2d2caff..05b197466f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -19,22 +19,22 @@ jobs: run: pip install ninja - uses: actions/checkout@v3 - name: Build - run: cargo build --verbose + run: cargo build -j 2 --verbose - name: Run tests - run: cargo test --verbose + run: cargo test -j 2 --verbose linux_stable: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Build - run: cargo build --verbose + run: cargo build -j 2 --verbose - name: Run tests - run: cargo test --verbose + run: cargo test -j 2 --verbose macos_stable: runs-on: macos-latest steps: - uses: actions/checkout@v3 - name: Build - run: cargo build --verbose + run: cargo build -j 3 --verbose - name: Run tests - run: cargo test --verbose + run: cargo test -j 3 --verbose From 6c17fc479a0b679bf96553d26f0e7157e7e403b8 Mon Sep 17 00:00:00 2001 From: Austin Johnson Date: Mon, 19 Dec 2022 14:44:55 -0600 Subject: [PATCH 4/4] undo last commit --- .github/workflows/rust.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 05b197466f..15b2d2caff 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -19,22 +19,22 @@ jobs: run: pip install ninja - uses: actions/checkout@v3 - name: Build - run: cargo build -j 2 --verbose + run: cargo build --verbose - name: Run tests - run: cargo test -j 2 --verbose + run: cargo test --verbose linux_stable: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Build - run: cargo build -j 2 --verbose + run: cargo build --verbose - name: Run tests - run: cargo test -j 2 --verbose + run: cargo test --verbose macos_stable: runs-on: macos-latest steps: - uses: actions/checkout@v3 - name: Build - run: cargo build -j 3 --verbose + run: cargo build --verbose - name: Run tests - run: cargo test -j 3 --verbose + run: cargo test --verbose