Skip to content

Commit

Permalink
Minor tweaks to the github actions configurations (#1606)
Browse files Browse the repository at this point in the history
* Replace custom cancellation action with `concurrency`

* Improve step names

... so don't have three steps with the same name

* Bump version of checkout action

checkout@v2 uses an old version of nodejs, which is deprecated.
  • Loading branch information
richvdh authored Mar 2, 2023
1 parent e84a43d commit a86754a
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 22 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/bindings_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ on:
- synchronize
- ready_for_review

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

env:
CARGO_TERM_COLOR: always
MATRIX_SDK_CRYPTO_NODEJS_PATH: bindings/matrix-sdk-crypto-nodejs
Expand All @@ -29,7 +33,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Install Protoc
uses: arduino/setup-protoc@v1
Expand Down Expand Up @@ -196,7 +200,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v3

# install protoc in case we end up rebuilding opentelemetry-proto
- name: Install Protoc
Expand Down
13 changes: 0 additions & 13 deletions .github/workflows/cancel_others.yml

This file was deleted.

16 changes: 10 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ on:
- synchronize
- ready_for_review

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

env:
CARGO_TERM_COLOR: always

Expand Down Expand Up @@ -40,7 +44,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
Expand Down Expand Up @@ -145,23 +149,23 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

# Can't use `${{ matrix.* }}` inside uses
- name: Install Rust
- name: Install Rust stable
if: matrix.rust == 'stable'
uses: dtolnay/rust-toolchain@stable

- name: Install Rust
- name: Install Rust beta
if: matrix.rust == 'beta'
uses: dtolnay/rust-toolchain@beta

- name: Install Rust
- name: Install Rust nightly
if: matrix.rust == 'nightly'
uses: dtolnay/rust-toolchain@nightly

Expand Down Expand Up @@ -274,7 +278,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
pull_request:
branches: [main]

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

env:
CARGO_TERM_COLOR: always

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ on:
branches: [main]
pull_request:

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

jobs:
docs:
name: All crates
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/xtask.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Calculate cache key
id: cachekey
Expand Down

0 comments on commit a86754a

Please sign in to comment.