Skip to content

Commit 7643d0c

Browse files
Merge branch 'main' into DOC-14111
2 parents b30cb45 + 257e28a commit 7643d0c

File tree

1,792 files changed

+201857
-41
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,792 files changed

+201857
-41
lines changed

src/current/Gemfile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@ git_source(:github) { |name| "https://github.com/#{name}.git" }
22
# frozen_string_literal: true
33
source "https://rubygems.org"
44

5-
# If you modify this file, you'll need to build a new version of the
6-
# docs-builder Docker image to keep things speedy in CI. See ci/README.md for
7-
# instructions.
8-
9-
# Removed `gem "jekyll", "~> 4.3"`` until conflict with our use of ianjevins/jekyll-remote-include is resolved (DOC-13509)
5+
# If you add to this file, it is recommended to run `make vendor`
6+
# (`gem install bundler && bundle install`) before running your next local build.
7+
# It may fail without at least running `bundle install`.
108
gem "jekyll", "4.3.4"
119
gem "liquid-c", "~> 4.0.0"
1210
gem "redcarpet", "~> 3.6"
1311
gem "rss"
1412
gem "webrick"
1513
gem "jekyll-minifier"
14+
gem "csv"
15+
gem "logger"
16+
gem "base64"
17+
gem "bigdecimal"
1618

1719
group :jekyll_plugins do
1820
gem "jekyll-include-cache"

src/current/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ linkcheck: cockroachdb-build
8585
vale:
8686
vale $(subst $(\n), $( ), $(shell git status --porcelain | cut -c 4- | egrep "\.md"))
8787

88+
.PHONY: vendor
8889
vendor:
8990
gem install bundler
9091
bundle install

src/current/_config_cockroachdb.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ destination: _site/docs
44
homepage_title: CockroachDB Docs
55
versions:
66
stable: v25.4
7-
dev: v25.4
7+
dev: v26.1

src/current/_data/releases.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9956,3 +9956,58 @@
99569956
docker_arm_limited_access: false
99579957
source: true
99589958
previous_release: v24.3.22
9959+
9960+
9961+
- release_name: v26.1.0-alpha.1
9962+
major_version: v26.1
9963+
release_date: '2025-12-04'
9964+
release_type: Testing
9965+
go_version: go1.25.3
9966+
sha: d90b48fdc3077318799afd2939837c79289156f4
9967+
has_sql_only: true
9968+
has_sha256sum: true
9969+
mac:
9970+
mac_arm: true
9971+
mac_arm_experimental: true
9972+
mac_arm_limited_access: false
9973+
windows: true
9974+
linux:
9975+
linux_arm: true
9976+
linux_arm_experimental: false
9977+
linux_arm_limited_access: false
9978+
linux_intel_fips: true
9979+
linux_arm_fips: false
9980+
docker:
9981+
docker_image: cockroachdb/cockroach-unstable
9982+
docker_arm: true
9983+
docker_arm_experimental: false
9984+
docker_arm_limited_access: false
9985+
source: true
9986+
9987+
9988+
- release_name: v25.4.1
9989+
major_version: v25.4
9990+
release_date: '2025-12-03'
9991+
release_type: Production
9992+
go_version: go1.25.3
9993+
sha: 60d802bd0bcb2c1aa81a4b5fd73fb4aa13bb5114
9994+
has_sql_only: true
9995+
has_sha256sum: true
9996+
mac:
9997+
mac_arm: true
9998+
mac_arm_experimental: true
9999+
mac_arm_limited_access: false
10000+
windows: true
10001+
linux:
10002+
linux_arm: true
10003+
linux_arm_experimental: false
10004+
linux_arm_limited_access: false
10005+
linux_intel_fips: true
10006+
linux_arm_fips: false
10007+
docker:
10008+
docker_image: cockroachdb/cockroach
10009+
docker_arm: true
10010+
docker_arm_experimental: false
10011+
docker_arm_limited_access: false
10012+
source: true
10013+
previous_release: v25.4.0

src/current/_data/v26.1/cluster-settings.csv

Lines changed: 464 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)