Skip to content

Commit 698d97d

Browse files
committed
Merge remote-tracking branch 'origin/master'
* origin/master: Bump actions/checkout from 5 to 6 (#702) Bump actions/cache from 4 to 5 (#705)
2 parents e2d7232 + d90f96b commit 698d97d

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/workflows/opencv-rust.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ jobs:
4141
SCCACHE_GHA_ENABLED: "true"
4242
RUSTC_WRAPPER: "sccache"
4343
steps:
44-
- uses: actions/checkout@v5
44+
- uses: actions/checkout@v6
4545
- uses: dtolnay/rust-toolchain@stable
4646
- uses: mozilla-actions/sccache-action@v0.0.9
4747

48-
- uses: actions/cache@v4
48+
- uses: actions/cache@v5
4949
with:
5050
path: ~/build
5151
key: build-${{ matrix.opencv-version }}-${{ matrix.linkage }}-${{ matrix.os-image }}
@@ -87,10 +87,10 @@ jobs:
8787
SCCACHE_GHA_ENABLED: "true"
8888
RUSTC_WRAPPER: "sccache"
8989
steps:
90-
- uses: actions/checkout@v5
90+
- uses: actions/checkout@v6
9191
- uses: dtolnay/rust-toolchain@stable
9292
- uses: mozilla-actions/sccache-action@v0.0.9
93-
- uses: actions/cache@v4
93+
- uses: actions/cache@v5
9494
with:
9595
path: ~/build
9696
key: vcpkg-${{ matrix.vcpkg-version }}-${{ matrix.os-image }}-${{ matrix.vcpkg-features-cache-key }}
@@ -129,7 +129,7 @@ jobs:
129129
SCCACHE_GHA_ENABLED: "true"
130130
RUSTC_WRAPPER: "sccache"
131131
steps:
132-
- uses: actions/checkout@v5
132+
- uses: actions/checkout@v6
133133
- uses: dtolnay/rust-toolchain@stable
134134
- uses: mozilla-actions/sccache-action@v0.0.9
135135

@@ -144,7 +144,7 @@ jobs:
144144
docs-rs:
145145
runs-on: ubuntu-24.04
146146
steps:
147-
- uses: actions/checkout@v5
147+
- uses: actions/checkout@v6
148148
- uses: dtolnay/rust-toolchain@stable
149149

150150
- name: Run a documentation generation test
@@ -158,10 +158,10 @@ jobs:
158158
SCCACHE_GHA_ENABLED: "true"
159159
RUSTC_WRAPPER: "sccache"
160160
steps:
161-
- uses: actions/checkout@v5
161+
- uses: actions/checkout@v6
162162
- uses: mozilla-actions/sccache-action@v0.0.9
163163

164-
- uses: actions/cache@v4
164+
- uses: actions/cache@v5
165165
with:
166166
path: ~/build
167167
key: build-${{ env.OPENCV_VERSION }}-dynamic-ubuntu-24.04

0 commit comments

Comments
 (0)