Skip to content

Commit

Permalink
feat(release): Implement releasing OpenDAL components seperately (#4196)
Browse files Browse the repository at this point in the history
* Save work

Signed-off-by: Xuanwo <github@xuanwo.io>

* Fix build

Signed-off-by: Xuanwo <github@xuanwo.io>

* Refactor

Signed-off-by: Xuanwo <github@xuanwo.io>

* Format cargo

Signed-off-by: Xuanwo <github@xuanwo.io>

* Fix typo

Signed-off-by: Xuanwo <github@xuanwo.io>

* Fix python

Signed-off-by: Xuanwo <github@xuanwo.io>

* Fix workspace

Signed-off-by: Xuanwo <github@xuanwo.io>

* Version should inside

Signed-off-by: Xuanwo <github@xuanwo.io>

* Fix build

Signed-off-by: Xuanwo <github@xuanwo.io>

---------

Signed-off-by: Xuanwo <github@xuanwo.io>
  • Loading branch information
Xuanwo authored Feb 18, 2024
1 parent e668413 commit e4a3450
Show file tree
Hide file tree
Showing 28 changed files with 284 additions and 185 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/ci_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ jobs:
FORCE_COLOR: 1
steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Rust Code Format
run: ./scripts/workspace.py cargo fmt -- --check

Expand All @@ -79,6 +81,9 @@ jobs:
uses: ./.github/actions/setup
with:
need-deny: true
- uses: actions/setup-python@v5
with:
python-version: "3.11"

- name: Check dependencies
run: python3 ./scripts/dependencies.py check
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci_core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
- name: Checkout python env
uses: actions/setup-python@v5
with:
python-version: "3.8"
python-version: "3.11"
- name: Checkout java env
uses: actions/setup-java@v4
with:
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
- name: Checkout python env
uses: actions/setup-python@v5
with:
python-version: "3.8"
python-version: "3.11"
- name: Checkout java env
uses: actions/setup-java@v4
with:
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
- name: Checkout python env
uses: actions/setup-python@v5
with:
python-version: "3.8"
python-version: "3.11"
- name: Checkout java env
uses: actions/setup-java@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Checkout python env
uses: actions/setup-python@v5
with:
python-version: "3.8"
python-version: "3.11"
- name: Checkout java env
uses: actions/setup-java@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
gpg-passphrase: MAVEN_GPG_PASSPHRASE
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.11'
- name: Install Protoc
uses: arduino/setup-protoc@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions bin/oay/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ homepage = "https://opendal.apache.org/"
license = "Apache-2.0"
repository = "https://github.com/apache/opendal"
rust-version = "1.67"
version = "0.41.0"
version = "0.41.0+core.0.45.0"

[features]
default = ["frontends-webdav", "frontends-s3"]
Expand All @@ -51,7 +51,7 @@ dav-server-opendalfs = { path = "../../integrations/dav-server", optional = true
dirs = "5.0.1"
futures = "0.3"
futures-util = { version = "0.3.29", optional = true }
opendal = { path="../../core" }
opendal = { version = "0.45.0", path = "../../core" }
quick-xml = { version = "0.31", features = ["serialize", "overlapped-lists"] }
serde = { version = "1", features = ["derive"] }
tokio = { version = "1.34", features = [
Expand Down
4 changes: 2 additions & 2 deletions bin/ofs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ categories = ["filesystem"]
description = "OpenDAL File System"
keywords = ["storage", "data", "s3", "fs", "azblob"]
name = "ofs"
version = "0.0.1"
version = "0.0.1+core.0.45.0"

authors = ["Apache OpenDAL <dev@opendal.apache.org>"]
edition = "2021"
Expand All @@ -39,7 +39,7 @@ futures-util = "0.3.30"
libc = "0.2.151"
log = "0.4.20"
nix = { version = "0.27.1", features = ["user"] }
opendal = {path="../../core"}
opendal = { version = "0.45.0", path = "../../core" }
tokio = { version = "1.34", features = [
"fs",
"macros",
Expand Down
4 changes: 2 additions & 2 deletions bin/oli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ homepage = "https://opendal.apache.org/"
license = "Apache-2.0"
repository = "https://github.com/apache/opendal"
rust-version = "1.67"
version = "0.41.0"
version = "0.41.0+core.0.45.0"

[features]
# Enable services dashmap support
Expand Down Expand Up @@ -60,7 +60,7 @@ dirs = "5.0.1"
env_logger = "0.10"
futures = "0.3"
log = "0.4"
opendal = {path="../../core"}
opendal = { version = "0.45.0", path = "../../core" }
serde = { version = "1", features = ["derive"] }
tokio = { version = "1.34", features = [
"fs",
Expand Down
6 changes: 4 additions & 2 deletions bindings/c/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ homepage = "https://opendal.apache.org/"
license = "Apache-2.0"
repository = "https://github.com/apache/opendal"
rust-version = "1.67"
version = "0.44.2"
version = "0.44.2+core.0.45.0"

[lib]
crate-type = ["cdylib", "staticlib"]
Expand All @@ -37,5 +37,7 @@ cbindgen = "0.26.0"
[dependencies]
bytes = "1.4.0"
once_cell = "1.17.1"
opendal = { path = "../../core", features = ["layers-blocking"] }
opendal = { version = "0.45", path = "../../core", features = [
"layers-blocking",
] }
tokio = { version = "1.27", features = ["fs", "macros", "rt-multi-thread"] }
4 changes: 2 additions & 2 deletions bindings/cpp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ homepage = "https://opendal.apache.org/"
license = "Apache-2.0"
repository = "https://github.com/apache/opendal"
rust-version = "1.67"
version = "0.44.2"
version = "0.44.2+core.0.45.0"

[lib]
crate-type = ["staticlib"]
Expand All @@ -34,7 +34,7 @@ crate-type = ["staticlib"]
anyhow = "1.0"
chrono = "0.4"
cxx = "1.0"
opendal = { path = "../../core" }
opendal = { version = "0.45.0", path = "../../core" }

[build-dependencies]
cxx-build = "1.0"
4 changes: 2 additions & 2 deletions bindings/dotnet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[package]
name = "opendal-dotnet"
publish = false
version = "0.1.0"
version = "0.1.0+core.0.45.0"

authors = ["Apache OpenDAL <dev@opendal.apache.org>"]
edition = "2021"
Expand All @@ -32,4 +32,4 @@ crate-type = ["cdylib"]
doc = false

[dependencies]
opendal = { path = "../../core" }
opendal = { version = "0.45.0", path = "../../core" }
2 changes: 1 addition & 1 deletion bindings/haskell/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ homepage = "https://opendal.apache.org/"
license = "Apache-2.0"
repository = "https://github.com/apache/opendal"
rust-version = "1.67"
version = "0.44.2"
version = "0.44.2+core.0.44.2"

[lib]
crate-type = ["cdylib"]
Expand Down
8 changes: 5 additions & 3 deletions bindings/java/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ homepage = "https://opendal.apache.org/"
license = "Apache-2.0"
repository = "https://github.com/apache/opendal"
rust-version = "1.67"
version = "0.45.0"
version = "0.45.0+core.0.45.0"

[lib]
crate-type = ["cdylib"]
Expand Down Expand Up @@ -156,14 +156,16 @@ anyhow = "1.0.71"
jni = "0.21.1"
num_cpus = "1.15.0"
once_cell = "1.19.0"
opendal = { path = "../../core", features = ["layers-blocking"] }
opendal = { version = "0.45.0", path = "../../core", features = [
"layers-blocking",
] }
tokio = { version = "1.28.1", features = ["full"] }

# This is not optimal. See also the Cargo issue:
# https://github.com/rust-lang/cargo/issues/1197#issuecomment-1641086954
[target.'cfg(unix)'.dependencies.opendal]
path = "../../core"
features = [
# Depend on "openssh" which depends on "tokio-pipe" that is unavailable on Windows.
"services-sftp",
]
path = "../../core"
4 changes: 2 additions & 2 deletions bindings/lua/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[package]
name = "opendal-lua"
publish = false
version = "0.1.0"
version = "0.1.0+core.0.45.0"

authors = ["Apache OpenDAL <dev@opendal.apache.org>"]
edition = "2021"
Expand All @@ -39,4 +39,4 @@ mlua = { version = "0.9", features = [
"module",
"macros",
], default-features = false, optional = true }
opendal = { path = "../../core" }
opendal = { version = "0.45.0", path = "../../core" }
6 changes: 4 additions & 2 deletions bindings/nodejs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ homepage = "https://opendal.apache.org/"
license = "Apache-2.0"
repository = "https://github.com/apache/opendal"
rust-version = "1.67"
version = "0.45.0"
version = "0.45.0+core.0.45.0"

[features]
default = [
Expand Down Expand Up @@ -157,7 +157,9 @@ napi = { version = "2.11.3", default-features = false, features = [
"async",
] }
napi-derive = "2.14.6"
opendal = { path = "../../core", features = ["layers-blocking"] }
opendal = { version = "0.45.0", path = "../../core", features = [
"layers-blocking",
] }
tokio = "1"

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion bindings/ocaml/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[package]
name = "opendal-ocaml"
publish = false
version = "0.0.0"
version = "0.0.0+core.0.44.2"

authors = ["Apache OpenDAL <dev@opendal.apache.org>"]
edition = "2021"
Expand Down
4 changes: 2 additions & 2 deletions bindings/php/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[package]
name = "opendal-php"
publish = false
version = "0.1.0"
version = "0.1.0+core.0.45.0"

authors = ["Apache OpenDAL <dev@opendal.apache.org>"]
edition = "2021"
Expand All @@ -32,4 +32,4 @@ crate-type = ["cdylib"]

[dependencies]
ext-php-rs = "0.11.2"
opendal = { path = "../../core" }
opendal = { version = "0.45.0", path = "../../core" }
7 changes: 5 additions & 2 deletions bindings/python/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ homepage = "https://opendal.apache.org/"
license = "Apache-2.0"
repository = "https://github.com/apache/opendal"
rust-version = "1.67"
version = "0.45.0"
version = "0.45.0+core.0.45.0"

[features]
default = [
Expand Down Expand Up @@ -154,12 +154,15 @@ doc = false

[dependencies]
futures = "0.3.28"
opendal = { path = "../../core", features = ["layers-blocking"] }
opendal = { version = "0.45.0", path = "../../core", features = [
"layers-blocking",
] }
pyo3 = "0.20.1"
pyo3-asyncio = { version = "0.20", features = ["tokio-runtime"] }
tokio = "1"

[target.'cfg(unix)'.dependencies.opendal]
version = "0.45.0"
path = "../../core"
features = [
"layers-blocking",
Expand Down
2 changes: 1 addition & 1 deletion bindings/python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ benchmark = [
"boto3-stubs[essential]",
]
docs = ["pdoc"]
test = ["pytest", "python-dotenv", "pytest-asyncio"]
lint = ["ruff"]
test = ["pytest", "python-dotenv", "pytest-asyncio"]

[project.urls]
Documentation = "https://opendal.apache.org/docs/python/opendal.html"
Expand Down
2 changes: 1 addition & 1 deletion bindings/ruby/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[package]
name = "opendal-ruby"
publish = false
version = "0.1.0"
version = "0.1.0+core.0.43.0"

authors = ["Apache OpenDAL <dev@opendal.apache.org>"]
edition = "2021"
Expand Down
4 changes: 2 additions & 2 deletions integrations/dav-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[package]
description = "Use OpenDAL as a backend to access data in various service with WebDAV protocol"
name = "dav-server-opendalfs"
version = "0.0.0"
version = "0.0.0+core.0.45.0"

authors = ["Apache OpenDAL <dev@opendal.apache.org>"]
edition = "2021"
Expand All @@ -35,7 +35,7 @@ dav-server = { version = "0.5.8" }
dirs = "5.0.0"
futures = "0.3"
futures-util = { version = "0.3.16" }
opendal = { path = "../../core"}
opendal = { version = "0.45.0", path = "../../core" }
quick-xml = { version = "0.31", features = ["serialize", "overlapped-lists"] }
serde = { version = "1", features = ["derive"] }
tokio = { version = "1.27", features = [
Expand Down
4 changes: 2 additions & 2 deletions integrations/object_store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ homepage = "https://opendal.apache.org/"
license = "Apache-2.0"
repository = "https://github.com/apache/opendal"
rust-version = "1.67"
version = "0.42.0"
version = "0.42.0+core.0.45.0"

[dependencies]
async-trait = "0.1"
bytes = "1"
futures = "0.3"
object_store = "0.7"
opendal = {path = "../../core"}
opendal = { version = "0.45.0", path = "../../core" }
tokio = "1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion scripts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ NOTES: all scripts must be running at root folder of OpenDAL project.
## Release

```shell
OPENDAL_VERSION=0.30.2 OPENDAL_VERSION_RC=rc1 ./scripts/release.sh
./scripts/release.py
```

> Before running release, please make sure you have bump all versions.
Expand Down
Loading

0 comments on commit e4a3450

Please sign in to comment.