Merge branch 'main' into rc/fix-distinct-agg-rule

.github/workflows/protobuf-breaking.yml

@@ -12,6 +12,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: bufbuild/buf-setup-action@v1
+        with:
+          github_token: ${{ github.token }}
       # Run breaking change detection against the `main` branch
       - uses: bufbuild/buf-breaking-action@v1
         with:

ci/scripts/common.env.sh

@@ -3,3 +3,6 @@ export PROTOC_NO_VENDOR=true
 export CARGO_HOME=/risingwave/.cargo
 export RISINGWAVE_CI=true
 export RUST_BACKTRACE=1
+if [ -n "${BUILDKITE_COMMIT:-}" ]; then
+  export GIT_SHA=$BUILDKITE_COMMIT
+fi

ci/scripts/docker.sh

@@ -11,7 +11,7 @@ dockerhubaddr="risingwavelabs/risingwave"
 arch="$(uname -m)"
 
 echo "--- docker build and tag"
-docker build -f docker/Dockerfile -t "${ghcraddr}:${BUILDKITE_COMMIT}-${arch}" --target risingwave .
+docker build -f docker/Dockerfile --build-arg "GIT_SHA=${BUILDKITE_COMMIT}" -t "${ghcraddr}:${BUILDKITE_COMMIT}-${arch}" --target risingwave .
 
 echo "--- check the image can start correctly"
 container_id=$(docker run -d "${ghcraddr}:${BUILDKITE_COMMIT}-${arch}" playground)

ci/workflows/main.yml

@@ -41,6 +41,8 @@ steps:
           run: rw-build-env
           config: ci/docker-compose.yml
           mount-buildkite-agent: true
+          env:
+            - BUILDKITE_COMMIT
     timeout_in_minutes: 20
     retry: *auto-retry
 

docker/Dockerfile

@@ -18,6 +18,9 @@ ENV PATH /root/.cargo/bin/:$PATH
 
 ENV IN_CONTAINER=1
 
+ARG GIT_SHA
+ENV GIT_SHA=$GIT_SHA
+
 # We need to add the `rustfmt` dependency, otherwise `risingwave_pb` will not compile
 RUN rustup self update \
   && rustup set profile minimal \

e2e_test/batch/catalog/pg_enum.slt.part

@@ -0,0 +1,3 @@
+query IIIT
+SELECT * FROM pg_catalog.pg_enum;
+----

e2e_test/batch/catalog/version.slt.part

@@ -1,4 +1,4 @@
 query T
-SELECT version();
+select substring(version() from 1 for 15);
 ----
-PostgreSQL 13.9-RW-0.2.0-alpha
+PostgreSQL 13.9