Skip to content

Commit

Permalink
refactor(ovfs): Split ovfs impl into virtiofs_opendal (#4723)
Browse files Browse the repository at this point in the history
* add virtiofs integrations

* remove virtiofs bin

* modify ci
  • Loading branch information
zjregee committed Jun 13, 2024
1 parent 27c6a77 commit a0268b9
Show file tree
Hide file tree
Showing 11 changed files with 66 additions and 268 deletions.
6 changes: 0 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@ updates:
schedule:
interval: "monthly"

- package-ecosystem: "cargo"
directory: "/bin/ovfs"
open-pull-requests-limit: 1
schedule:
interval: "monthly"

- package-ecosystem: "cargo"
directory: "/integrations/dav-server"
open-pull-requests-limit: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

name: Ovfs CI
name: Integration Fuse3 CI

on:
push:
Expand All @@ -25,9 +25,9 @@ on:
branches:
- main
paths:
- "bin/ovfs/**"
- "integrations/fuse3/**"
- "core/**"
- ".github/workflows/ci_bin_ovfs.yml"
- ".github/workflows/ci_integration_fuse3.yml"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
Expand All @@ -47,5 +47,5 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Cargo clippy
working-directory: bin/ovfs
working-directory: integrations/fuse3
run: cargo clippy --all-targets --all-features -- -D warnings
51 changes: 51 additions & 0 deletions .github/workflows/ci_integration_virtiofs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

name: Integration Virtiofs CI

on:
push:
branches:
- main
pull_request:
branches:
- main
paths:
- "integrations/virtiofs/**"
- "core/**"
- ".github/workflows/ci_integration_virtiofs.yml"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
cancel-in-progress: true

jobs:
check_clippy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Setup Rust toolchain
uses: ./.github/actions/setup
with:
need-rocksdb: true
need-protoc: true
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Cargo clippy
working-directory: integrations/virtiofs
run: cargo clippy --all-targets --all-features -- -D warnings
225 changes: 0 additions & 225 deletions bin/ovfs/Cargo.lock

This file was deleted.

26 changes: 0 additions & 26 deletions bin/ovfs/DEPENDENCIES.rust.tsv

This file was deleted.

1 change: 1 addition & 0 deletions integrations/virtiofs/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Cargo.lock
11 changes: 9 additions & 2 deletions bin/ovfs/Cargo.toml → integrations/virtiofs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,16 @@
# under the License.

[package]
name = "ovfs"
version = "0.1.0"
description = "virtiofs integration for Apache OpenDAL"
name = "virtiofs_opendal"

authors = ["Apache OpenDAL <[email protected]>"]
edition = "2021"
homepage = "https://opendal.apache.org/"
license = "Apache-2.0"
repository = "https://github.com/apache/opendal"
rust-version = "1.75"
version = "0.1.0"

[dependencies]
snafu = "0.8.3"
Expand Down
File renamed without changes.
6 changes: 1 addition & 5 deletions bin/ovfs/src/main.rs → integrations/virtiofs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,4 @@

mod error;
mod virtiofs;
mod virtiofs_utils;

fn main() {
unimplemented!()
}
mod virtiofs_util;
File renamed without changes.
File renamed without changes.

0 comments on commit a0268b9

Please sign in to comment.