Skip to content

Commit ffec492

Browse files
chore: cleanup for moving oli/ofs and removing oay (#6689) (#6700)
1 parent 0363f3f commit ffec492

File tree

10 files changed

+19
-158
lines changed

10 files changed

+19
-158
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -88,25 +88,7 @@ updates:
8888
- "getrandom"
8989

9090

91-
- package-ecosystem: "cargo"
92-
directory: "/bin/ofs"
93-
open-pull-requests-limit: 1
94-
schedule:
95-
interval: "monthly"
96-
cooldown:
97-
semver-patch-days: 90
98-
include:
99-
- "*"
10091

101-
- package-ecosystem: "cargo"
102-
directory: "/bin/oli"
103-
open-pull-requests-limit: 1
104-
schedule:
105-
interval: "monthly"
106-
cooldown:
107-
semver-patch-days: 90
108-
include:
109-
- "*"
11092

11193
- package-ecosystem: "cargo"
11294
directory: "/integrations/dav-server"

.github/workflows/ci_bin_ofs.yml

Lines changed: 0 additions & 51 deletions
This file was deleted.

.github/workflows/ci_bin_oli.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

.github/workflows/release_rust.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ jobs:
4949
- "integrations/fuse3"
5050
- "integrations/unftp-sbe"
5151
- "integrations/cloud_filter"
52-
- "bin/oli"
53-
- "bin/ofs" # depends on integrations/{fuse3,cloud_filter}
5452
steps:
5553
- uses: actions/checkout@v5
5654
- name: Checkout python env

.vscode/settings.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
"${workspaceFolder}/core/Cargo.toml",
1111
"${workspaceFolder}/bindings/python/Cargo.toml",
1212
"${workspaceFolder}/bindings/java/Cargo.toml",
13-
"${workspaceFolder}/bindings/nodejs/Cargo.toml",
14-
"${workspaceFolder}/bin/oli/Cargo.toml",
15-
"${workspaceFolder}/bin/oay/Cargo.toml",
16-
"${workspaceFolder}/bin/ofs/Cargo.toml"
13+
"${workspaceFolder}/bindings/nodejs/Cargo.toml"
1714
],
1815
"java.compile.nullAnalysis.mode": "automatic",
1916
"cmake.ignoreCMakeListsMissing": true,

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ OpenDAL's development is guided by its vision of **One Layer, All Storage** and
8787
|| [oli] | Access data via Command Line (alternative to s3cmd, s3cli, azcopy) | [![oli image]][oli crate] |
8888
|| [ofs] | Access data via POSIX file system API (alternative to s3fs) | [![ofs image]][ofs crate] |
8989

90-
[oli]: bin/oli/README.md
90+
[oli]: https://opendal.apache.org/docs/40-apps/oli
9191
[oli image]: https://img.shields.io/crates/v/oli.svg
9292
[oli crate]: https://crates.io/crates/oli
93-
[ofs]: bin/ofs/README.md
93+
[ofs]: https://opendal.apache.org/docs/40-apps/ofs
9494
[ofs image]: https://img.shields.io/crates/v/ofs.svg
9595
[ofs crate]: https://crates.io/crates/ofs
9696

dev/src/release/package.rs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,7 @@ pub fn all_packages() -> Vec<Package> {
7070
let parquet = make_package("integrations/parquet", "0.6.1", vec![core.clone()]);
7171
let unftp_sbe = make_package("integrations/unftp-sbe", "0.3.1", vec![core.clone()]);
7272

73-
// Binaries
74-
let ofs = make_package(
75-
"bin/ofs",
76-
"0.0.24",
77-
vec![core.clone(), fuse3.clone(), cloud_filter.clone()],
78-
);
79-
let oli = make_package("bin/oli", "0.41.23", vec![core.clone()]);
73+
// Binaries moved to separate repositories; no longer released from this repo
8074

8175
// Bindings
8276
let c = make_package("bindings/c", "0.46.3", vec![core.clone()]);
@@ -93,8 +87,6 @@ pub fn all_packages() -> Vec<Package> {
9387
object_store,
9488
parquet,
9589
unftp_sbe,
96-
ofs,
97-
oli,
9890
c,
9991
cpp,
10092
java,
@@ -112,8 +104,6 @@ pub fn update_package_version(package: &Package) -> bool {
112104
"integrations/object_store" => update_cargo_version(&package.path, &package.version),
113105
"integrations/parquet" => update_cargo_version(&package.path, &package.version),
114106
"integrations/unftp-sbe" => update_cargo_version(&package.path, &package.version),
115-
"bin/ofs" => update_cargo_version(&package.path, &package.version),
116-
"bin/oli" => update_cargo_version(&package.path, &package.version),
117107

118108
"bindings/c" => false, // C bindings has no version to update
119109
"bindings/cpp" => false, // C++ bindings has no version to update

website/docs/40-apps/oay.mdx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ title: Oay (removed)
44

55
This tool has been removed from the Apache OpenDAL repository.
66

7-
If you relied on oay, please see the release notes and migration guidance in the repository for details.
7+
If you relied on oay, please see the migration tracking issue and release notes for details:
8+
9+
- Migration tracking: https://github.com/apache/opendal/issues/6689

website/docs/40-apps/ofs.mdx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
2-
title: Ofs
2+
title: Ofs (moved)
33
---
44

5-
import GitHubReadme from '@site/components/GitHubReadme';
6-
import Content from '../../../bin/ofs/README.md';
5+
Ofs has moved to a separate repository and is no longer maintained in this repository.
76

8-
<GitHubReadme basePath="bin/ofs/">
9-
<Content components={{ h1: 'h2' }} />
10-
</GitHubReadme>
7+
For migration details and the latest links:
8+
9+
- Migration tracking: https://github.com/apache/opendal/issues/6689
10+
- Crate: https://crates.io/crates/ofs

website/docs/40-apps/oli.mdx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
2-
title: Oli
2+
title: Oli (moved)
33
---
44

5-
import GitHubReadme from '@site/components/GitHubReadme';
6-
import Content from '../../../bin/oli/README.md';
5+
Oli has moved to a separate repository and is no longer maintained in this repository.
76

8-
<GitHubReadme basePath="bin/oli/">
9-
<Content components={{ h1: 'h2' }} />
10-
</GitHubReadme>
7+
For migration details and the latest links:
8+
9+
- Migration tracking: https://github.com/apache/opendal/issues/6689
10+
- Crate: https://crates.io/crates/oli

0 commit comments

Comments
 (0)