Skip to content

Commit

Permalink
Trust dtolnay/rust-toolchain (matrix-org#15406)
Browse files Browse the repository at this point in the history
* Trust dtolnay/rust-toolchain

The author is a big deal in the Rust world and I'm happy to trust them.
I'm also bored of the dependabot updates tbh.

* Changelog
  • Loading branch information
David Robertson authored and realtyem committed Apr 12, 2023
1 parent f79b527 commit 3ddceae
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 77 deletions.
12 changes: 3 additions & 9 deletions .github/workflows/latest_deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install Rust
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
with:
toolchain: stable
uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2

# The dev dependencies aren't exposed in the wheel metadata (at least with current
Expand Down Expand Up @@ -61,9 +59,7 @@ jobs:
- uses: actions/checkout@v3

- name: Install Rust
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
with:
toolchain: stable
uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2

- run: sudo apt-get -qq install xmlsec1
Expand Down Expand Up @@ -134,9 +130,7 @@ jobs:
- uses: actions/checkout@v3

- name: Install Rust
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
with:
toolchain: stable
uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2

- name: Ensure sytest runs `pip install`
Expand Down
70 changes: 11 additions & 59 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install Rust
# There don't seem to be versioned releases of this action per se: for each rust
# version there is a branch which gets constantly rebased on top of master.
# We pin to a specific commit for paranoia's sake.
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
with:
toolchain: 1.58.1
uses: dtolnay/[email protected]
- uses: Swatinem/rust-cache@v2
- uses: matrix-org/setup-python-poetry@v1
with:
Expand Down Expand Up @@ -104,12 +99,7 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Install Rust
# There don't seem to be versioned releases of this action per se: for each rust
# version there is a branch which gets constantly rebased on top of master.
# We pin to a specific commit for paranoia's sake.
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
with:
toolchain: 1.58.1
uses: dtolnay/[email protected]
- uses: Swatinem/rust-cache@v2
- uses: matrix-org/setup-python-poetry@v1
with:
Expand All @@ -126,12 +116,8 @@ jobs:
- uses: actions/checkout@v3

- name: Install Rust
# There don't seem to be versioned releases of this action per se: for each rust
# version there is a branch which gets constantly rebased on top of master.
# We pin to a specific commit for paranoia's sake.
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
uses: dtolnay/[email protected]
with:
toolchain: 1.58.1
components: clippy
- uses: Swatinem/rust-cache@v2

Expand All @@ -148,10 +134,7 @@ jobs:
- uses: actions/checkout@v3

- name: Install Rust
# There don't seem to be versioned releases of this action per se: for each rust
# version there is a branch which gets constantly rebased on top of master.
# We pin to a specific commit for paranoia's sake.
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2022-12-01
components: clippy
Expand All @@ -168,10 +151,7 @@ jobs:
- uses: actions/checkout@v3

- name: Install Rust
# There don't seem to be versioned releases of this action per se: for each rust
# version there is a branch which gets constantly rebased on top of master.
# We pin to a specific commit for paranoia's sake.
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
uses: dtolnay/rust-toolchain@master
with:
# We use nightly so that it correctly groups together imports
toolchain: nightly-2022-12-01
Expand Down Expand Up @@ -236,12 +216,7 @@ jobs:
postgres:${{ matrix.job.postgres-version }}
- name: Install Rust
# There don't seem to be versioned releases of this action per se: for each rust
# version there is a branch which gets constantly rebased on top of master.
# We pin to a specific commit for paranoia's sake.
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
with:
toolchain: 1.58.1
uses: dtolnay/[email protected]
- uses: Swatinem/rust-cache@v2

- uses: matrix-org/setup-python-poetry@v1
Expand Down Expand Up @@ -281,12 +256,7 @@ jobs:
- uses: actions/checkout@v3

- name: Install Rust
# There don't seem to be versioned releases of this action per se: for each rust
# version there is a branch which gets constantly rebased on top of master.
# We pin to a specific commit for paranoia's sake.
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
with:
toolchain: 1.58.1
uses: dtolnay/[email protected]
- uses: Swatinem/rust-cache@v2

# There aren't wheels for some of the older deps, so we need to install
Expand Down Expand Up @@ -402,12 +372,7 @@ jobs:
run: cat sytest-blacklist .ci/worker-blacklist > synapse-blacklist-with-workers

- name: Install Rust
# There don't seem to be versioned releases of this action per se: for each rust
# version there is a branch which gets constantly rebased on top of master.
# We pin to a specific commit for paranoia's sake.
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
with:
toolchain: 1.58.1
uses: dtolnay/[email protected]
- uses: Swatinem/rust-cache@v2

- name: Run SyTest
Expand Down Expand Up @@ -547,12 +512,7 @@ jobs:
path: synapse

- name: Install Rust
# There don't seem to be versioned releases of this action per se: for each rust
# version there is a branch which gets constantly rebased on top of master.
# We pin to a specific commit for paranoia's sake.
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
with:
toolchain: 1.58.1
uses: dtolnay/[email protected]
- uses: Swatinem/rust-cache@v2

- uses: actions/setup-go@v4
Expand Down Expand Up @@ -580,12 +540,7 @@ jobs:
- uses: actions/checkout@v3

- name: Install Rust
# There don't seem to be versioned releases of this action per se: for each rust
# version there is a branch which gets constantly rebased on top of master.
# We pin to a specific commit for paranoia's sake.
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
with:
toolchain: 1.58.1
uses: dtolnay/[email protected]
- uses: Swatinem/rust-cache@v2

- run: cargo test
Expand All @@ -603,10 +558,7 @@ jobs:
- uses: actions/checkout@v3

- name: Install Rust
# There don't seem to be versioned releases of this action per se: for each rust
# version there is a branch which gets constantly rebased on top of master.
# We pin to a specific commit for paranoia's sake.
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2022-12-01
- uses: Swatinem/rust-cache@v2
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/twisted_trunk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ jobs:
- uses: actions/checkout@v3

- name: Install Rust
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
with:
toolchain: stable
uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2

- uses: matrix-org/setup-python-poetry@v1
Expand All @@ -50,9 +48,7 @@ jobs:
- run: sudo apt-get -qq install xmlsec1

- name: Install Rust
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
with:
toolchain: stable
uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2

- uses: matrix-org/setup-python-poetry@v1
Expand Down Expand Up @@ -89,9 +85,7 @@ jobs:
- uses: actions/checkout@v3

- name: Install Rust
uses: dtolnay/rust-toolchain@fc3253060d0c959bea12a59f10f8391454a0b02d
with:
toolchain: stable
uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2

- name: Patch dependencies
Expand Down
1 change: 1 addition & 0 deletions changelog.d/15406.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Trust dtonlay/rust-toolchain in CI.

0 comments on commit 3ddceae

Please sign in to comment.