Skip to content

Commit 4ef1b86

Browse files
authored
fix(ci): move to tashi-actions-runner (#56)
* fix(ci): move to `tashi-actions-runner` TODO: docker publish step * fix(ci): use Github runner for `tmq-docker-publish` * fix(ci): use CirrusLabs runner for `tmq-build-macos` * fix: clippy warnings for 1.84 * fix(ci): run `tmq-tests-e2e` on CirrusLabs Linux runner
1 parent 76b31c8 commit 4ef1b86

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
jobs:
2525
tmq-format:
2626
name: Format
27-
runs-on: tashi-arc
27+
runs-on: tashi-actions-runner
2828
timeout-minutes: 10
2929
steps:
3030
- name: Check out
@@ -42,7 +42,7 @@ jobs:
4242

4343
tmq-check:
4444
name: Check
45-
runs-on: tashi-arc
45+
runs-on: tashi-actions-runner
4646
timeout-minutes: 10
4747
steps:
4848
- name: Check out
@@ -73,7 +73,7 @@ jobs:
7373

7474
tmq-tests-unit:
7575
name: Unit Tests
76-
runs-on: tashi-arc
76+
runs-on: tashi-actions-runner
7777
timeout-minutes: 10
7878
steps:
7979
- name: Check out
@@ -102,7 +102,7 @@ jobs:
102102
tmq-tests-e2e:
103103
name: End-to-End Tests
104104
timeout-minutes: 10
105-
runs-on: tashi-arc-dind
105+
runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04-md
106106
env:
107107
NODE_VERSION: v20.11.0
108108
defaults:
@@ -177,7 +177,7 @@ jobs:
177177
name: Release Build - macOS
178178
if: ${{ inputs.enable-macOS || inputs.release-version != '' }}
179179
needs: tmq-check
180-
runs-on: macOS
180+
runs-on: ghcr.io/cirruslabs/macos-runner:sonoma
181181
timeout-minutes: 30
182182
env:
183183
GIT_SSH_COMMAND: ssh -i .ssh/id_ed25519
@@ -201,9 +201,9 @@ jobs:
201201
key: macOS-build
202202

203203
- name: Install/Update Rust
204-
run: |
205-
rustup update stable
206-
rustup target add x86_64-apple-darwin
204+
uses: actions-rust-lang/setup-rust-toolchain@v1
205+
with:
206+
target: x86_64-apple-darwin
207207

208208
- name: Build
209209
run: |
@@ -283,7 +283,7 @@ jobs:
283283
name: Release Build - Linux
284284
# This one doesn't cost us anything to run
285285
needs: tmq-check
286-
runs-on: tashi-arc
286+
runs-on: tashi-actions-runner
287287
timeout-minutes: 15
288288
steps:
289289
- name: Check out
@@ -320,7 +320,7 @@ jobs:
320320

321321
tmq-draft-release:
322322
if: ${{ inputs.release-version != '' }}
323-
runs-on: tashi-arc
323+
runs-on: tashi-actions-runner
324324
needs:
325325
- tmq-build-macos
326326
- tmq-build-windows
@@ -425,12 +425,13 @@ jobs:
425425

426426
tmq-docker-publish:
427427
if: ${{ inputs.release-version != '' }}
428-
runs-on: tashi-arc-dind
428+
# Just use CI minutes for this job since it's only run manually.
429+
runs-on: ubuntu-latest
429430
# Just to make sure the rest of the release process went okay.
430431
needs: tmq-draft-release
431432
steps:
432433
- name: Log in to registry
433-
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
434+
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
434435

435436
- name: Fetch Linux Artifact
436437
uses: actions/download-artifact@v4

src/mqtt/trie/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ where
5151

5252
// fixme: This iterator is very inefficient (O(n) scans per tree depth) but it probably doesn't matter because this is a Debug impl.
5353
// it's O(1) memory usage though.
54-
impl<'a, T> Iterator for Iter<'a, T> {
54+
impl<T> Iterator for Iter<'_, T> {
5555
type Item = NodeId;
5656

5757
fn next(&mut self) -> Option<Self::Item> {
@@ -179,7 +179,7 @@ impl<T> FilterTrie<T> {
179179
pub fn contains_entry(&self, entry_id: EntryId) -> bool {
180180
self.nodes
181181
.get(entry_id.node_id)
182-
.map_or(false, |it| it[entry_id.leaf_kind].is_some())
182+
.is_some_and(|it| it[entry_id.leaf_kind].is_some())
183183
}
184184

185185
fn lookup(&self, filter: &Filter) -> Option<EntryId> {

0 commit comments

Comments
 (0)