Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into dependabot/cargo/rustls-pemfile-2.1.1
Browse files Browse the repository at this point in the history
xiangjinwu authored Mar 27, 2024
2 parents 77e195d + 1e84852 commit fb78b0e
Showing 716 changed files with 16,055 additions and 10,023 deletions.
4 changes: 2 additions & 2 deletions .github/aws-config/Dockerfile
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ CMD bash
# Commands:
# aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/x5u3w5h
# docker build -t risingwave-build-env .
# docker tag risingwave-build-env:latest public.ecr.aws/x5u3w5h6/risingwave-build-env:latest
# docker push public.ecr.aws/x5u3w5h6/risingwave-build-env:latest
# docker tag risingwave-build-env:latest public.ecr.aws/w1p7b4n3/risingwave-build-env:latest
# docker push public.ecr.aws/w1p7b4n3/risingwave-build-env:latest

# Install Ubuntu packages.
# Please add packages in alphabetical order.
24 changes: 12 additions & 12 deletions .github/workflows/cherry-pick-to-release-branch.yml
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@ on:
types: ["closed", "labeled"]

jobs:
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:
@@ -16,14 +16,14 @@ 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"
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"
runs-on: ubuntu-latest
name: release_pull_request
steps:
@@ -32,14 +32,14 @@ jobs:
- name: Create PR to branch
uses: risingwavelabs/github-action-cherry-pick@master
with:
pr_branch: 'release-1.7'
pr_branch: 'release-1.7.0-standalone'
pr_labels: 'cherry-pick'
pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.7', github.event.number) }}
pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.7.0-standalone', github.event.number) }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

release_pull_request_1_6:
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-1.6') && github.event.pull_request.merged == true"
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:
@@ -48,8 +48,8 @@ jobs:
- name: Create PR to branch
uses: risingwavelabs/github-action-cherry-pick@master
with:
pr_branch: 'release-1.6'
pr_branch: 'release-1.7'
pr_labels: 'cherry-pick'
pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.6', github.event.number) }}
pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.7', github.event.number) }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 0 additions & 1 deletion .github/workflows/dashboard_main.yml
Original file line number Diff line number Diff line change
@@ -22,7 +22,6 @@ jobs:
npm install
npm run lint
npm run build
npm run build-static
- name: Deploy
uses: s0/git-publish-subdir-action@develop
env:
1 change: 0 additions & 1 deletion .github/workflows/dashboard_pr.yml
Original file line number Diff line number Diff line change
@@ -61,4 +61,3 @@ jobs:
npm run lint
npm run build
npm run build-static
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@ go/bin/
src/**/target
src/**/target_tarpaulin
target/
target-bisector-*/
src/proto/
src/prost/src/*.rs
src/prost/src/sim/*.rs
Loading

0 comments on commit fb78b0e

Please sign in to comment.