Fix merge conflict (#41853)

Closes #ISSUE

Release Notes:

- N/A
This commit is contained in:
Conrad Irwin
2025-11-03 13:41:39 -07:00
committed by GitHub
parent 8217e57a2d
commit d075a56ee7
8 changed files with 27 additions and 27 deletions
+3 -3
View File
@@ -30,10 +30,10 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
clean: false
- name: steps::cache_rust_dependencies
uses: swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
- name: steps::cache_rust_dependencies_namespace
uses: namespacelabs/nscloud-cache-action@v1
with:
save-if: ${{ github.ref == 'refs/heads/main' }}
cache: rust
- name: steps::setup_linux
run: ./script/linux
shell: bash -euxo pipefail {0}