Skip to content

Commit cbd57e3

Browse files
WorkerPantsXuanwohuonw
authored
feat(ghac): Bump opendal to support ghac v2 (Cherry-pick of #21994) (#21997)
Github is planning to sunset the legacy services before March 1st. This PR updates OpenDAL to version 0.52.0, which automatically supports GHAC v2. The ghac v2 requires using azblob to upload data internally, so we need to add some extra dependencies in this PR. Perhaps we can consider enabling both s3 and azblob support in the future since all dependencies have already been included. Refer to apache/opendal#5620 for more details. Signed-off-by: Xuanwo <[email protected]> Co-authored-by: Xuanwo <[email protected]> Co-authored-by: Huon Wilson <[email protected]>
1 parent 4514391 commit cbd57e3

File tree

5 files changed

+76
-9
lines changed

5 files changed

+76
-9
lines changed

docs/notes/2.25.x.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ one in `remote_store_headers` or `remote_execution_headers`.
3232

3333
Pants now supports the `{chroot}` replacement marker in remote execution contexts. (With local and Docker execution, the `{chroot}` marker is replaced with the absolute path of the sandbox directory if it appears in program arguments or environment variables. Pants will do the same as well in remote execution contexts. This requires `/bin/bash` to be available on the remote execution server.)
3434

35-
The OpenDAL library powering the Github Actions cache backend has been updated, picking up some bug fixes for Github Enterprise Server instances using AWS S3 as backing storage for the Github Actions cache.
35+
The OpenDAL library powering the Github Actions cache backend has been updated, picking up support for the new GitHub Actions cache v2, and some bug fixes for Github Enterprise Server instances using AWS S3 as backing storage for the Github Actions cache.
3636

3737
### New Options System
3838

src/rust/engine/Cargo.lock

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

src/rust/engine/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ notify = { git = "https://github.com/pantsbuild/notify", rev = "276af0f3c5f300bf
275275
num_cpus = "1"
276276
num_enum = "0.5"
277277
once_cell = "1.20"
278-
opendal = { version = "0.51.1", default-features = false, features = [
278+
opendal = { version = "0.52.0", default-features = false, features = [
279279
"services-memory",
280280
"services-fs",
281281
"services-ghac",

src/rust/engine/remote_provider/remote_provider_opendal/src/action_cache_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ async fn write_test_data(provider: &Provider, digest: Digest, data: remexec::Act
5151
.operator
5252
.write(&test_path(digest), data.to_bytes())
5353
.await
54-
.unwrap()
54+
.unwrap();
5555
}
5656

5757
#[tokio::test]

src/rust/engine/remote_provider/remote_provider_opendal/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ impl ByteStoreProvider for Provider {
211211
let path = self.path(digest.hash);
212212

213213
match self.operator.write(&path, bytes).await {
214-
Ok(()) => Ok(()),
214+
Ok(_) => Ok(()),
215215
// The item already exists, i.e. these bytes have already been stored. For example,
216216
// concurrent executions that are caching the same bytes. This makes the assumption that
217217
// which ever execution won the race to create the item successfully finishes the write, and

0 commit comments

Comments
 (0)