Skip to content

Commit

Permalink
chore(ci): use our custom runners for cross-linux + checks, and nativ…
Browse files Browse the repository at this point in the history
…e action cancellation (vectordotdev#12669)
  • Loading branch information
tobz authored May 10, 2022
1 parent a03b261 commit 10dae1c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 deletions.
20 changes: 6 additions & 14 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
branches:
- master

concurrency:
group: ${{ github.ref }}
cancel-in-progress: true

env:
AUTOINSTALL: true
AWS_ACCESS_KEY_ID: "dummy"
Expand All @@ -22,17 +26,6 @@ env:
RUSTFLAGS: "-D warnings"

jobs:
cancel-previous:
name: Cancel redundant jobs
runs-on: ubuntu-20.04
timeout-minutes: 3
if: github.ref != 'refs/heads/master'
steps:
- uses: styfle/[email protected]
with:
access_token: ${{ secrets.GITHUB_TOKEN }}
all_but_latest: true # can cancel workflows scheduled later

changes:
runs-on: ubuntu-20.04
# Set job outputs to values from filter step
Expand Down Expand Up @@ -171,7 +164,7 @@ jobs:

cross-linux:
name: Cross - ${{ matrix.target }}
runs-on: ubuntu-20.04
runs-on: [linux, test-runner]
needs: changes
env:
CARGO_INCREMENTAL: 0
Expand Down Expand Up @@ -298,7 +291,7 @@ jobs:

checks:
name: Checks
runs-on: ubuntu-20.04
runs-on: [linux, test-runner]
needs: changes
env:
CARGO_INCREMENTAL: 0
Expand Down Expand Up @@ -357,7 +350,6 @@ jobs:
name: master-failure
if: failure() && github.ref == 'refs/heads/master'
needs:
- cancel-previous
- changes
- cross-linux
- test-misc
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ tokio-postgres = { version = "0.7.6", default-features = false, features = ["run
tokio-tungstenite = {version = "0.15.0", default-features = false, features = ["connect"], optional = true}
toml = { version = "0.5.9", default-features = false }
tonic = { version = "0.7.1", optional = true, default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "compression"] }
trust-dns-proto = { version = "0.21", default-features = false, features = ["dnssec"], optional = true }
trust-dns-proto = { version = "0.21.0", default-features = false, features = ["dnssec"], optional = true }
typetag = { version = "0.1.8", default-features = false }
url = { version = "2.2.2", default-features = false, features = ["serde"] }
uuid = { version = "1", default-features = false, features = ["serde", "v4"] }
Expand Down

0 comments on commit 10dae1c

Please sign in to comment.