Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
chenzl25 committed Jun 14, 2024
2 parents efb0947 + fa50276 commit 341a016
Show file tree
Hide file tree
Showing 528 changed files with 12,401 additions and 6,231 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
path: 'helm-charts'
reviewers: arkbriar
delete-branch: true
signoff: true

update-risingwave-operator:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -75,3 +76,4 @@ jobs:
path: 'risingwave-operator'
reviewers: arkbriar
delete-branch: true
signoff: true
57 changes: 57 additions & 0 deletions .github/workflows/package_version_check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Package Version Checker

on:
pull_request:
branches:
- 'main'

jobs:
compare-package-version-with-latest-release-version:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: List branches
run: |
git fetch --all
release_branches=$(git branch -r | grep -E 'origin/release-[0-9]+\.[0-9]+' | sed 's/origin\///')
echo "Release branches:"
echo "$release_branches"
echo "$release_branches" > release_branches.txt
- name: Pick latest release branch
run: |
release_branches=$(cat release_branches.txt)
latest_branch=$(echo "$release_branches" | sort -t. -k1,1 -k2,2 -Vr | head -n 1)
echo "Latest release branch: $latest_branch"
latest_version=$(echo "$latest_branch" | sed -E 's/release-([0-9]+\.[0-9]+)/\1/' | sed 's/^[ \t]*//')
echo "Latest release version: $latest_version"
echo "$latest_version" > latest_release_version.txt
- name: Read Cargo.toml version
run: |
cargo_version=$(grep -oP '(?<=^version = ")[0-9]+\.[0-9]+' Cargo.toml)
echo "Cargo.toml version: $cargo_version"
echo "$cargo_version" > cargo_version.txt
- name: Compare versions
run: |
latest_version=$(cat latest_release_version.txt)
cargo_version=$(cat cargo_version.txt)
latest_major=$(echo $latest_version | cut -d. -f1)
latest_minor=$(echo $latest_version | cut -d. -f2)
cargo_major=$(echo $cargo_version | cut -d. -f1)
cargo_minor=$(echo $cargo_version | cut -d. -f2)
if [ "$cargo_major" -lt "$latest_major" ] || { [ "$cargo_major" -eq "$latest_major" ] && [ "$cargo_minor" -le "$latest_minor" ]; }; then
echo "Error: Cargo.toml package version $cargo_version is not larger than $latest_version"
exit 1
else
echo "Cargo.toml version $cargo_version is larger than or equal to $latest_version"
fi
33 changes: 29 additions & 4 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,50 @@ name: Mark stale issues and pull requests
on:
schedule:
- cron: '30 1 * * *'
workflow_dispatch:
inputs:
# https://github.com/marketplace/actions/close-stale-issues#operations-per-run
operationsPerRun:
description: 'Max number of operations per run'
required: true
default: 30

jobs:
stale:

runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write

steps:
- uses: actions/stale@v5
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: >
This issue has been open for 60 days with no activity.
Could you please update the status? Feel free to continue discussion or close as not planned.
If you think it is still relevant today, and needs to be done *in the near future*, you can comment to update the status, or just manually remove the `no-issue-activity` label.
You can also confidently close this issue as not planned to keep our backlog clean.
Don't worry if you think the issue is still valuable to continue in the future.
It's searchable and can be reopened when it's time. 😄
stale-pr-message: >
This PR has been open for 60 days with no activity.
Could you please update the status? Feel free to ping a reviewer if you are waiting for review.
If it's blocked by code review, feel free to ping a reviewer or ask someone else to review it.
If you think it is still relevant today, and have time to work on it *in the near future*, you can comment to update the status, or just manually remove the `no-pr-activity` label.
You can also confidently close this PR to keep our backlog clean. (If no further action taken, the PR will be automatically closed after 7 days. Sorry! 🙏)
Don't worry if you think the PR is still valuable to continue in the future.
It's searchable and can be reopened when it's time. 😄
close-pr-message: >
Close this PR as there's no further actions taken after it is marked as stale for 7 days. Sorry! 🙏
You can reopen it when you have time to continue working on it.
stale-issue-label: 'no-issue-activity'
stale-pr-label: 'no-pr-activity'
days-before-close: -1
days-before-pr-close: 7
operations-per-run: ${{ github.event.inputs.operationsPerRun }}
enable-statistics: true
Loading

0 comments on commit 341a016

Please sign in to comment.