Merge remote-tracking branch 'origin/main' into jrinehart/license-year-2026

# Conflicts:
#	bufstream/iceberg-quickstart/cmd/producer/producer.go
#	bufstream/iceberg-quickstart/pkg/app/app.go
#	bufstream/iceberg-quickstart/pkg/csr/csr.go
#	bufstream/iceberg-quickstart/pkg/kafka/kafka.go
#	bufstream/iceberg-quickstart/pkg/produce/producer.go
#	bufstream/iceberg-quickstart/proto/bufstream/demo/v1/demo.proto
#	protovalidate/bufstream/finish/cmd/bufstream-demo-consume/main.go
#	protovalidate/bufstream/finish/cmd/bufstream-demo-produce/main.go
#	protovalidate/bufstream/finish/pkg/app/app.go
#	protovalidate/bufstream/finish/pkg/consume/consumer.go
#	protovalidate/bufstream/finish/pkg/csr/csr.go
#	protovalidate/bufstream/finish/pkg/kafka/kafka.go
#	protovalidate/bufstream/finish/pkg/produce/producer.go
#	protovalidate/bufstream/finish/proto/bufstream/demo/v1/demo.proto
#	protovalidate/bufstream/start/cmd/bufstream-demo-consume/main.go
#	protovalidate/bufstream/start/cmd/bufstream-demo-produce/main.go
#	protovalidate/bufstream/start/pkg/app/app.go
#	protovalidate/bufstream/start/pkg/consume/consumer.go
#	protovalidate/bufstream/start/pkg/csr/csr.go
#	protovalidate/bufstream/start/pkg/kafka/kafka.go
#	protovalidate/bufstream/start/pkg/produce/producer.go
#	protovalidate/bufstream/start/proto/bufstream/demo/v1/demo.proto

Author: jrinehart-buf

.github/workflows/buf.yaml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - uses: bufbuild/buf-action@8f4a1456a0ab6a1eb80ba68e53832e6fcfacc16c # v1.3.0
         with:
           input: cli/breaking-change-detection/start
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - uses: bufbuild/buf-action@8f4a1456a0ab6a1eb80ba68e53832e6fcfacc16c # v1.3.0
         with:
           input: cli/limit-output-types
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - uses: bufbuild/buf-action@8f4a1456a0ab6a1eb80ba68e53832e6fcfacc16c # v1.3.0
         with:
           input: cli/linting/finish
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - uses: bufbuild/buf-action@8f4a1456a0ab6a1eb80ba68e53832e6fcfacc16c # v1.3.0
         with:
           input: cli/workspace/observabilityapi
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - uses: bufbuild/buf-action@8f4a1456a0ab6a1eb80ba68e53832e6fcfacc16c # v1.3.0
         with:
           input: cli/workspace/observabilitytypes

.github/workflows/ci.yaml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: Buf Action
         uses: bufbuild/buf-action@8f4a1456a0ab6a1eb80ba68e53832e6fcfacc16c # v1.3.0
         with:
@@ -19,7 +19,7 @@ jobs:
       BUF_TOKEN: ${{ secrets.BUF_TOKEN }}
     steps:
       - name: Checkout Code
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           fetch-depth: 1
           submodules: false
@@ -28,7 +28,7 @@ jobs:
         with:
           go-version-file: protovalidate/quickstart-go/finish/go.mod
       - name: Install Java
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
         with:
           distribution: 'temurin'
           java-version: '11'

Makefile

@@ -47,16 +47,12 @@ license-header: $(BIN)/license-header
 ################################################################################
 
 .PHONY: ci
-ci: ci-bsr ci-bufstream ci-protovalidate \
+ci: ci-bsr ci-protovalidate \
 
 .PHONY: ci-bsr
 ci-bsr:
 	cd bsr && $(MAKE)
 
-.PHONY: ci-bufstream
-ci-bufstream:
-	cd bufstream/iceberg-quickstart && $(MAKE)
-
 .PHONY: ci-protovalidate
 ci-protovalidate:
 	cd protovalidate && $(MAKE)

bufstream/iceberg-quickstart/.gitignore

@@ -2,15 +2,8 @@
 
 # Bufstream and Iceberg quickstart
 
-This directory contains example code for Bufstream's [Iceberg quickstart][docs].
-It walks through the key tasks for creating a local Bufstream and Iceberg environment:
+This example has been consolidated into the [Bufstream quickstart][quickstart]. 
+Its code is in the [bufstream-demo][repo] repository.
 
-1. Deploying a Docker-based Bufstream environment with local object storage and Iceberg REST catalog.
-2. Configuring Bufstream and a topic for Iceberg archival.
-3. Running the Iceberg archival process on demand.
-4. Querying Iceberg with Apache Spark and a Jupyter Notebook.
-
-Note that the MinIO image within this Docker Compose project is provided by [lithus](https://github.com/golithus/minio-builds). [MinIO ceased publishing public Docker images](https://github.com/minio/minio/issues/21647) in October 2025.
-
-
-[docs]: https://buf.build/docs/bufstream/iceberg/quickstart/
+[quickstart]: https://buf.build/docs/bufstream/quickstart/
+[repo]: https://github.com/bufbuild/bufstream-demo