Skip to content

Commit fe09d4d

Browse files
committed
Merge branch 'master' into jerbaroo-faster-prefer-distinct
2 parents f644d6c + d531634 commit fe09d4d

15 files changed

Lines changed: 135 additions & 221 deletions

File tree

‎.github/actions/setup-nix-direnv-rust/action.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ description: Checks out the git repo and sets up Nix, Direnv and Rust, with appr
33
runs:
44
using: "composite"
55
steps:
6-
- uses: nixbuild/nix-quick-install-action@8505cd40ae3d4791ca658f2697c5767212e5ce71 # v30
7-
- uses: nix-community/cache-nix-action@135667ec418502fa5a3598af6fb9eb733888ce6a # v6
6+
- uses: nixbuild/nix-quick-install-action@9f63be77f412a248c9d9a65a4c82cf066cdf8f0c # Latest as of 2026-07-31
7+
- uses: nix-community/cache-nix-action@7df957e333c1e5da7721f60227dbba6d06080569 # Latest as of 2026-07-31
88
with:
99
# restore and save a cache using this key
1010
primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix', 'nix/sources.json', 'rust-toolchain.toml') }}
1111
# if there's no cache hit, restore a cache by this prefix
1212
restore-prefixes-first-match: nix-${{ runner.os }}-
13-
- uses: HatsuneMiku3939/direnv-action@89ed6f6786c25aa7a69cd12f9fd0fdcb46c7c489 # Latest as of 2025-05-16
14-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
13+
- uses: HatsuneMiku3939/direnv-action@c81e6f10d47895cdd46432d8801bff0fabc73a6b # Latest as of 2026-07-31
14+
- uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # Latest as of 2026-07-31
1515
with:
1616
cache-all-crates: "true"

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
name: Continuous Integration
2-
on: [push]
2+
"on": [push]
33
jobs:
44
test-unit:
55
name: Unit tests
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
8+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # Latest as of 2026-07-31
99
- uses: ./.github/actions/setup-nix-direnv-rust
1010
- run: just test-unit
1111
test-integration:
1212
name: Integration test (& build all in dev-mode)
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
15+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # Latest as of 2026-07-31
1616
- uses: ./.github/actions/setup-nix-direnv-rust
1717
- run: OPSQUEUE_PYTEST_TIMEOUT=600 just test-integration
1818
lint:
1919
name: Lint & Style Check
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
22+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # Latest as of 2026-07-31
23+
with:
24+
# We need tags for the `just semver` check, which is part of `just lint`, so we fetch them here.
25+
fetch-tags: "true"
2326
- uses: ./.github/actions/setup-nix-direnv-rust
2427
- run: |
25-
just lint-light --show-diff-on-failure --all
26-
just lint-heavy
28+
just lint

‎.semaphore/semaphore.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,4 @@ blocks:
8686
jobs:
8787
- name: "Type- and format-check"
8888
commands:
89-
- "just lint-light --show-diff-on-failure --all"
90-
- "just lint-heavy"
89+
- "just lint"

‎Cargo.lock‎

Lines changed: 4 additions & 113 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)