Skip to content

Commit

Permalink
fix: resolve conflicts with develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
niebayes committed Dec 27, 2023
2 parents 3fbeae7 + feec4e2 commit db631dd
Show file tree
Hide file tree
Showing 74 changed files with 1,841 additions and 1,117 deletions.
4 changes: 4 additions & 0 deletions .github/doc-label-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Doc not needed:
- '- \[x\] This PR does not require documentation updates.'
Doc update required:
- '- \[ \] This PR does not require documentation updates.'
1 change: 1 addition & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ Please explain IN DETAIL what the changes are in this PR and why they are needed

- [ ] I have written the necessary rustdoc comments.
- [ ] I have added the necessary unit tests and integration tests.
- [ ] This PR does not require documentation updates.

## Refer to a related PR or issue link (optional)
20 changes: 20 additions & 0 deletions .github/workflows/doc-label.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: "PR Doc Labeler"
on:
pull_request_target:
types: [opened, edited, synchronize, ready_for_review, auto_merge_enabled, labeled, unlabeled]

permissions:
pull-requests: write
contents: read

jobs:
triage:
if: ${{ github.repository == 'GreptimeTeam/greptimedb' }}
runs-on: ubuntu-latest
steps:
- uses: github/[email protected]
with:
configuration-path: .github/doc-label-config.yml
enable-versioned-regex: false
repo-token: ${{ secrets.GITHUB_TOKEN }}
sync-labels: 1
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ env:
# The scheduled version is '${{ env.NEXT_RELEASE_VERSION }}-nightly-YYYYMMDD', like v0.2.0-nigthly-20230313;
NIGHTLY_RELEASE_PREFIX: nightly
# Note: The NEXT_RELEASE_VERSION should be modified manually by every formal release.
NEXT_RELEASE_VERSION: v0.5.0
NEXT_RELEASE_VERSION: v0.6.0

jobs:
allocate-runners:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/size-label.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
name: size-labeler

on: [pull_request]
on: [pull_request_target]

jobs:
labeler:
runs-on: ubuntu-latest
name: Label the PR size
permissions:
issues: write
pull-requests: write
steps:
- uses: codelytv/pr-size-labeler@v1
with:
Expand All @@ -22,5 +25,4 @@ jobs:
This PR exceeds the recommended size of 1000 lines.
Please make sure you are NOT addressing multiple issues with one PR.
Note this PR might be rejected due to its size.
github_api_url: 'api.github.com'
files_to_ignore: 'Cargo.lock'
Loading

0 comments on commit db631dd

Please sign in to comment.