Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
jason420247 authored Jun 14, 2024
2 parents cdf3187 + ac7abd9 commit 963ce44
Show file tree
Hide file tree
Showing 1,441 changed files with 57,595 additions and 36,759 deletions.
3 changes: 0 additions & 3 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,3 @@ rustflags = [
# Flags for all targets.
[target.'cfg(all())']
rustflags = ["--cfg", "tokio_unstable"]

[unstable]
lints = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Update Helm Charts and Risingwave Operator on New Release

on:
release:
types: [published]
workflow_dispatch:
inputs:
version:
description: 'release version'
required: true

env:
NEW_APP_VERSION: ${{ github.event.inputs.version || github.event.release.tag_name }}

jobs:
update-helm-charts:
runs-on: ubuntu-latest
steps:
- name: Checkout Helm Charts Repository
uses: actions/checkout@v3
with:
repository: 'risingwavelabs/helm-charts'
token: ${{ secrets.PR_TOKEN }}
path: 'helm-charts'

- name: Update values.yaml
run: |
sed -i "s/^ tag:.*/ tag: \"${{ env.NEW_APP_VERSION }}\"/" helm-charts/charts/risingwave/values.yaml
- name: Update Chart.yaml
run: |
cd helm-charts/charts/risingwave
CURRENT_VERSION=$(grep 'version:' Chart.yaml | awk '{print $2}' | head -n 1)
NEW_VERSION=$(echo $CURRENT_VERSION | awk -F. -v OFS='.' '{$NF++; print}')
sed -i "/type: application/,/version:/!b; /version:/s/version: .*/version: $NEW_VERSION/" Chart.yaml
sed -i "s/^appVersion: .*/appVersion: \"${{ env.NEW_APP_VERSION }}\"/" Chart.yaml
echo "NEW_CHART_VERSION=$NEW_VERSION" >> $GITHUB_ENV
- name: Create Pull Request
uses: peter-evans/create-pull-request@v6
with:
token: ${{ secrets.PR_TOKEN }}
commit-message: 'chore: bump risingwave to ${{ env.NEW_APP_VERSION }}, release chart ${{ env.NEW_CHART_VERSION }}'
title: 'chore: bump risingwave to ${{ env.NEW_APP_VERSION }}, release chart ${{ env.NEW_CHART_VERSION }}'
body: 'This is an automated pull request to update the chart versions'
branch: 'auto-update-${{ env.NEW_APP_VERSION }}'
path: 'helm-charts'
reviewers: arkbriar
delete-branch: true
signoff: true

update-risingwave-operator:
runs-on: ubuntu-latest
steps:
- name: Checkout Risingwave Operator Repository
uses: actions/checkout@v3
with:
repository: 'risingwavelabs/risingwave-operator'
token: ${{ secrets.PR_TOKEN }}
path: 'risingwave-operator'

- name: Update risingwave-operator image tags
run: |
cd risingwave-operator
PREV_VERSION=$(grep -roh "risingwavelabs/risingwave:v[0-9\.]*" * | head -n 1 | cut -d':' -f2)
grep -rl "risingwavelabs/risingwave:$PREV_VERSION" . | xargs sed -i "s|risingwavelabs/risingwave:$PREV_VERSION|risingwavelabs/risingwave:${{ env.NEW_APP_VERSION }}|g"
- name: Create Pull Request for risingwave-operator
uses: peter-evans/create-pull-request@v6
with:
token: ${{ secrets.PR_TOKEN }}
commit-message: 'chore: bump risingwave image tags to ${{ env.NEW_APP_VERSION }}'
title: 'chore: bump risingwave image tags to ${{ env.NEW_APP_VERSION }}'
body: 'This is an automated pull request to update the risingwave image tags'
branch: 'auto-update-${{ env.NEW_APP_VERSION }}'
path: 'risingwave-operator'
reviewers: arkbriar
delete-branch: true
signoff: true
31 changes: 8 additions & 23 deletions .github/workflows/cherry-pick-to-release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ on:
types: ["closed", "labeled"]

jobs:
release_pull_request_1_8:
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-1.8') && github.event.pull_request.merged == true"
release_pull_request_1_9:
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-1.9') && github.event.pull_request.merged == true"
runs-on: ubuntu-latest
name: release_pull_request
steps:
Expand All @@ -16,14 +16,14 @@ jobs:
- name: Create PR to branch
uses: risingwavelabs/github-action-cherry-pick@master
with:
pr_branch: 'release-1.8'
pr_branch: 'release-1.9'
pr_labels: 'cherry-pick'
pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.8', github.event.number) }}
pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.9', github.event.number) }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

release_pull_request_1_7_standalone:
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-1.7-standalone') && github.event.pull_request.merged == true"
release_pull_request_1_8:
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-1.8') && github.event.pull_request.merged == true"
runs-on: ubuntu-latest
name: release_pull_request
steps:
Expand All @@ -32,24 +32,9 @@ jobs:
- name: Create PR to branch
uses: risingwavelabs/github-action-cherry-pick@master
with:
pr_branch: 'release-1.7.0-standalone'
pr_branch: 'release-1.8'
pr_labels: 'cherry-pick'
pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.7.0-standalone', github.event.number) }}
pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.8', github.event.number) }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

release_pull_request_1_7:
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-1.7') && 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: 'release-1.7'
pr_labels: 'cherry-pick'
pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.7', github.event.number) }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12 changes: 8 additions & 4 deletions .github/workflows/connector-node-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: Connector Node Integration Tests

on:
push:
branches: [main]
branches: [ main ]
pull_request:
branches: [main]
branches: [ main ]
merge_group:
types: [checks_requested]
types: [ checks_requested ]

jobs:
build:
Expand Down Expand Up @@ -42,4 +42,8 @@ jobs:
echo "--- build connector node"
cd ${RISINGWAVE_ROOT}/java
# run unit test
mvn --batch-mode --update-snapshots clean package -Dno-build-rust
# WARN: `testOnNext_writeValidation` is skipped because it relies on Rust code to decode message,
# while we don't build Rust code (`-Dno-build-rust`) here to save time
mvn --batch-mode --update-snapshots clean package -Dno-build-rust \
'-Dtest=!com.risingwave.connector.sink.SinkStreamObserverTest#testOnNext_writeValidation' \
-Dsurefire.failIfNoSpecifiedTests=false
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
name: Dashboard (main)
name: Dashboard
on:
push:
branches: [main]
paths: [dashboard/**, proto/**]
pull_request:
branches: [main]
paths: [dashboard/**, proto/**]
workflow_dispatch:
jobs:
dashboard-ui-deploy:
Expand All @@ -19,11 +22,14 @@ jobs:
- name: build
working-directory: ./dashboard
run: |
echo "::group::npm install"
npm install
echo "::endgroup::"
npm run lint
npm run build
- name: Deploy
uses: s0/git-publish-subdir-action@develop
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
env:
REPO: self
BRANCH: dashboard-artifact
Expand Down
63 changes: 0 additions & 63 deletions .github/workflows/dashboard_pr.yml

This file was deleted.

25 changes: 15 additions & 10 deletions .github/workflows/nightly-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,25 @@ name: Build with Latest Nightly Rust
on:
schedule:
- cron: "0 0 * * *"
push:
branches:
- xxchan/latest-nightly-rust
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Maximize build space
uses: easimon/maximize-build-space@master
with:
remove-dotnet: 'true'
remove-android: 'true'
remove-haskell: 'true'
remove-codeql: 'true'
remove-docker-images: 'true'
root-reserve-mb: 2048
swap-size-mb: 8192
- name: Maximize build space
uses: easimon/maximize-build-space@master
with:
remove-dotnet: 'true'
remove-android: 'true'
remove-haskell: 'true'
remove-codeql: 'true'
remove-docker-images: 'true'
root-reserve-mb: 10240
temp-reserve-mb: 10240
- uses: actions/checkout@v3
if: ${{ github.event_name == 'schedule' }}
with:
Expand All @@ -40,3 +43,5 @@ jobs:
export CARGO_INCREMENTAL=0
export CARGO_PROFILE_DEV_DEBUG=false
cargo check
- name: Show available storage
run: df -h
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
Loading

0 comments on commit 963ce44

Please sign in to comment.