Skip to content

Commit

Permalink
Merge branch 'main' into compaction-node-manager
Browse files Browse the repository at this point in the history
  • Loading branch information
LeslieKid authored Oct 29, 2024
2 parents 7fdde51 + 60b5217 commit a47a82e
Show file tree
Hide file tree
Showing 52 changed files with 1,360 additions and 581 deletions.
2 changes: 1 addition & 1 deletion .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ github:
protected_branches:
main:
required_pull_request_reviews:
dismiss_stale_reviews: true
dismiss_stale_reviews: false
required_approving_review_count: 1
protected_tags: []

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-pr-title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
with:
script: |
const title = context.payload.pull_request.title;
const regex = /^(feat|fix|docs|refactor|chore)(\(.+\))?!?: .+$/;
const regex = /^(feat|fix|docs|refactor|chore|test|style|build)(\(.+\))?!?: .+$/;
if (!regex.test(title)) {
core.setFailed('PR title does not follow the convention, the pattern: ^(feat|fix|docs|refactor|chore)(\(.+\))?!?: .+$');
}
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ on:
- 'Cargo.lock'
- '.github/workflows/ci.yml'

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

# Common environment variables
env:
RUSTFLAGS: "-C debuginfo=1"
Expand Down Expand Up @@ -71,11 +75,13 @@ jobs:
rustup component add clippy
rustup component add rustfmt
cargo install --git https://github.com/DevinR528/cargo-sort --rev 55ec890 --locked
curl --proto '=https' --tlsv1.2 -LsSf https://github.com/korandoru/hawkeye/releases/download/v5.8.1/hawkeye-installer.sh | sh
- name: Run Style Check
run: |
make clippy
make fmt
make check-cargo-toml
make check-asf-header
make clippy
unit-test:
name: unit-test
Expand Down
45 changes: 45 additions & 0 deletions .github/workflows/links.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# 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: Check markdown links

on:
merge_group:
workflow_dispatch:
schedule:
- cron: '2 0 * * *'
push:
branches:
- main
- dev
pull_request:

jobs:
url-check:
name: url-check
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- uses: actions/checkout@v4
- name: Install deps
run: |
pip3 install urlchecker
- name: Check markdown links
run: |
urlchecker check --file-types '*.md' \
--exclude-urls 'http://127.0.0.1:5440/sql,https://github.com/apache/horaedb/issues/new' \
.
4 changes: 4 additions & 0 deletions .github/workflows/metric-engine-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ jobs:
- name: Release Disk Quota
run: |
sudo make ensure-disk-quota
- name: Setup Build Environment
run: |
sudo apt update
sudo apt install --yes protobuf-compiler
- name: Install check binaries
run: |
rustup component add clippy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tsbs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Setup Build Environment
run: |
sudo apt update
sudo apt install --yes protobuf-compiler
sudo apt install --yes protobuf-compiler liblzma-dev
- name: Build server
run: |
make build
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ For features, we don't plan to support we will close the feature request ticket

## Contributing Changes

HoraeDB is written mostly in idiomatic Rust—please see the [Style Guide](https://horaedb.apache.org/dev/style_guide.html) for more details.
HoraeDB is written mostly in idiomatic Rust—please see the [Style Guide](https://horaedb.apache.org/docs/dev/style_guide/) for more details.
All code must adhere to the `rustfmt` format, and pass all of the `clippy` checks we run in CI (there are more details further down this README).

### Making a PR
Expand All @@ -38,7 +38,7 @@ PR title.

For PRs that you consider ready for review, verify the following locally before you submit it:

* you have a coherent set of logical commits, with messages conforming to the [Conventional Commits](https://horaedb.apache.org/docs/dev/conventional_commit/) specification;
* you have a coherent set of logical commits, with messages conforming to the [Conventional Commits](https://horaedb.apache.org/docs/dev/style_guide/) specification;
* all the tests and/or benchmarks pass, including documentation tests;
* the code is correctly formatted and all `clippy` checks pass; and
* you haven't left any "code cruft" (commented out code blocks etc).
Expand Down
Loading

0 comments on commit a47a82e

Please sign in to comment.