From 41197dfa1c1ea983d1c81455e4ef1d295c842b43 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Thu, 20 Jul 2023 11:45:20 +0800 Subject: [PATCH 1/4] ci: Setup protoc in rust builder Signed-off-by: Xuanwo --- .github/actions/setup/action.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml index 257e5c57c1b9..bac7c9b31913 100644 --- a/.github/actions/setup/action.yaml +++ b/.github/actions/setup/action.yaml @@ -39,6 +39,9 @@ runs: # Enable sparse index echo "CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse" >> $GITHUB_ENV + - name: Setup protoc + uses: arduino/setup-protoc@v2 + - name: Cache nextest on linux id: cache-nextest uses: actions/cache@v3 From fa88874694581711183cb4c3950209062b8b84b2 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Thu, 20 Jul 2023 11:56:58 +0800 Subject: [PATCH 2/4] trigger build Signed-off-by: Xuanwo --- core/src/services/oss/backend.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/services/oss/backend.rs b/core/src/services/oss/backend.rs index e3bb47456e39..370c7d2e7fcf 100644 --- a/core/src/services/oss/backend.rs +++ b/core/src/services/oss/backend.rs @@ -40,6 +40,7 @@ use crate::*; const DEFAULT_WRITE_MIN_SIZE: usize = 8 * 1024 * 1024; const DEFAULT_BATCH_MAX_OPERATIONS: usize = 1000; + /// Aliyun Object Storage Service (OSS) support #[doc = include_str!("docs.md")] #[derive(Default)] From c13e13a28bfad86e8bbfaa18de47443a0728021d Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Thu, 20 Jul 2023 12:03:19 +0800 Subject: [PATCH 3/4] Use apt to install Signed-off-by: Xuanwo --- .github/actions/setup/action.yaml | 6 ++++-- .github/workflows/ci.yml | 3 +++ .github/workflows/docs.yml | 1 + .github/workflows/publish.yml | 4 ++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml index bac7c9b31913..41402dd00e06 100644 --- a/.github/actions/setup/action.yaml +++ b/.github/actions/setup/action.yaml @@ -39,8 +39,10 @@ runs: # Enable sparse index echo "CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse" >> $GITHUB_ENV - - name: Setup protoc - uses: arduino/setup-protoc@v2 + - name: Setup protoc on linux + if: inputs.need-protoc == 'true' && runner.os == 'Linux' + shell: bash + run: sudo apt install -y protobuf-compiler - name: Cache nextest on linux id: cache-nextest diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a25879e8a7f8..c73c8a1bd345 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,6 +59,7 @@ jobs: uses: ./.github/actions/setup with: need-rocksdb: true + need-protoc: true - name: Checkout python env uses: actions/setup-python@v4 @@ -83,6 +84,7 @@ jobs: uses: ./.github/actions/setup with: need-rocksdb: true + need-protoc: true - name: Checkout python env uses: actions/setup-python@v4 @@ -145,6 +147,7 @@ jobs: uses: ./.github/actions/setup with: need-rocksdb: true + need-protoc: true - name: Build run: cargo build --all-features diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b14c294501f5..da5fc1101de5 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -44,6 +44,7 @@ jobs: uses: ./.github/actions/setup with: need-rocksdb: true + need-protoc: true - uses: actions/setup-java@v3 with: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f0e8a3a41db9..bc85c667f991 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -36,8 +36,12 @@ jobs: with: distribution: temurin java-version: "11" + - name: Setup Rust toolchain uses: ./.github/actions/setup + with: + need-rocksdb: true + need-protoc: true - name: Publish opendal working-directory: "core" From 78c65b84d4861d5d58f8f12031158e73d500e7a2 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Thu, 20 Jul 2023 12:04:55 +0800 Subject: [PATCH 4/4] Fix Signed-off-by: Xuanwo --- .github/actions/setup/action.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml index 41402dd00e06..d1db35edb298 100644 --- a/.github/actions/setup/action.yaml +++ b/.github/actions/setup/action.yaml @@ -22,6 +22,8 @@ inputs: description: "This setup needs rocksdb or not" need-nextest: description: "This setup needs nextest or not" + need-protoc: + description: "This setup needs protoc or not" runs: using: "composite"