Skip to content

Commit

Permalink
Merge branch 'main' into wrj/fix-udf-decimal
Browse files Browse the repository at this point in the history
Signed-off-by: Runji Wang <[email protected]>
  • Loading branch information
wangrunji0408 committed Sep 9, 2023
2 parents 2dcf944 + f649aa6 commit 0140a5a
Show file tree
Hide file tree
Showing 922 changed files with 36,834 additions and 12,053 deletions.
23 changes: 4 additions & 19 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,8 @@ rustflags = [
# uncomment the following two lines to enable `TaskLocalAlloc`
# "--cfg",
# "enable_task_local_alloc",
# lints
# TODO: use lint configuration in cargo https://github.com/rust-lang/cargo/issues/5034
"-Funused_must_use",
"-Aclippy::uninlined_format_args",
"-Wclippy::dbg_macro",
"-Wclippy::disallowed_methods",
"-Wclippy::disallowed_types",
"-Wclippy::doc_markdown",
"-Wclippy::explicit_into_iter_loop",
"-Wclippy::explicit_iter_loop",
"-Wclippy::inconsistent_struct_constructor",
"-Wclippy::unused_async",
"-Wclippy::map_flatten",
"-Wclippy::no_effect_underscore_binding",
"-Wclippy::await_holding_lock",
"-Wrustdoc::broken_intra_doc_links",
"-Wfuture_incompatible",
"-Wnonstandard_style",
"-Wrust_2018_idioms",

]

[unstable]
lints = true
18 changes: 17 additions & 1 deletion .github/workflows/cherry-pick-to-release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:
branches:
- main
types: ["closed"]
types: ["closed", "labeled"]

jobs:
release_pull_request_1_1:
Expand All @@ -22,3 +22,19 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

release_pull_request_1_2:
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-v1.2') && github.event.pull_request.merged == true"
runs-on: ubuntu-latest
name: release_pull_request
steps:
- name: checkout
uses: actions/checkout@v1
- name: Create PR to branch
uses: risingwavelabs/github-action-cherry-pick@master
with:
pr_branch: 'v1.2-rc'
pr_labels: 'cherry-pick'
pr_body: ${{ format('Cherry picking \#{0} onto branch v1.2-rc', github.event.number) }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

37 changes: 25 additions & 12 deletions .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ on:
branches:
- main

env:
SCCACHE_GHA_ENABLED: "true"
RUSTC_WRAPPER: "sccache"
RUSTDOCFLAGS: "--cfg docsrs --markdown-css rust.css --markdown-no-toc --index-page /home/runner/work/risingwave/risingwave/docs/rustdoc/index.md -Zunstable-options"

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -18,24 +23,32 @@ jobs:
uses: mozilla-actions/[email protected]
with:
version: "v0.5.2"
- name: Docs
- name: build rustdocs
run: |
RUSTDOCFLAGS="--markdown-css rust.css --markdown-no-toc --index-page docs/rustdoc/index.md -Zunstable-options" cargo doc --workspace --no-deps --document-private-items
cargo doc --workspace --no-deps --document-private-items
cp docs/rustdoc/rust.css target/doc/rust.css
env:
SCCACHE_GHA_ENABLED: "true"
RUSTC_WRAPPER: "sccache"
- name: Fix file permissions
shell: sh
mkdir artifact
cp -R target/doc/* artifact
- name: Install cargo-docset
uses: taiki-e/install-action@v2
with:
tool: cargo-docset
- name: build docsets
run: |
chmod -c -R +rX "target/doc" |
while read line; do
echo "::warning title=Invalid file permissions automatically fixed::$line"
done
cargo docset --no-clean --docset-name RisingWave
tar -czf risingwave.docset.tgz target/docset/risingwave.docset
echo "<entry>
<version>$(date -u +%Y-%m-%dT%H:%M:%SZ)</version>
<url>https://risingwavelabs.github.io/risingwave/risingwave.docset.tgz</url>
</entry>" > RisingWave.xml
cp -t artifact "risingwave.docset.tgz" "RisingWave.xml"
- name: Upload artifacts
uses: actions/upload-pages-artifact@v1
with:
path: target/doc
path: artifact

deploy:
needs: build
Expand Down
1 change: 1 addition & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Cargo.lock @risingwavelabs/cargo-lock
Loading

0 comments on commit 0140a5a

Please sign in to comment.