Skip to content

Commit

Permalink
Merge branch 'duckdb:main' into sql-only-extensions
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex-Monahan committed Sep 17, 2024
2 parents f66d9b0 + c68c615 commit cdba071
Show file tree
Hide file tree
Showing 519 changed files with 75,962 additions and 7,017 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/jekyll.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ jobs:
# create a copy of the _site directory for the offline package
cp -r _site duckdb-docs
echo "To browse the DuckDB website locally, run \`python -m http.server\` in this directory and connect to http://localhost:8000/" > duckdb-docs/README.md
# replace the necessary strings to ensure everything works properly after offline deployment.
python scripts/offline_docs_replace.py
# cleanup some directories, including the old (archive) pages
rm -rf scripts single-file-document duckdb-docs/docs/archive
# create archive
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/update-docs.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
on:
schedule:
- cron: "0 5 * * 1" # run every Monday day at 5AM
workflow_dispatch: {} # allow running manually from the github ui

env:
Expand Down
11 changes: 11 additions & 0 deletions BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,3 +216,14 @@ The solution, according to a [Stack Overflow answer](https://stackoverflow.com/a
```bash
gem update --system
```
### `ERROR bad URI`
The following error occurs when trying to access the locally built website via HTTPS (`https://localhost:4000/`).
```console
[2024-09-17 12:15:36] ERROR bad URI `����\x12`�\x17\x03�L\x00\x00\x14�'.
[2024-09-17 12:15:36] ERROR bad Request-Line ...
```
This happens frequently with browsers looking to force an HTTPS connection such as Safari.
The solution is to use an HTTP connection (`http://localhost:4000`) and optionally try another browser (e.g., Chrome or Firefox).
18 changes: 9 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GIT

GIT
remote: https://github.com/duckdb/rouge.git
revision: 69a17028114bd34a98d646b1bbf60d0b34876bad
revision: 97560470d9a6bb1ff8fd4ddc102496ccf9a752bd
branch: duckdb
specs:
rouge (3.3823.1)
Expand Down Expand Up @@ -58,26 +58,26 @@ GEM
octokit (>= 4, < 8)
public_suffix (>= 3.0, < 6.0)
typhoeus (~> 1.3)
google-protobuf (4.28.0)
google-protobuf (4.28.1)
bigdecimal
rake (>= 13)
google-protobuf (4.28.0-aarch64-linux)
google-protobuf (4.28.1-aarch64-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.28.0-arm64-darwin)
google-protobuf (4.28.1-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.28.0-x86-linux)
google-protobuf (4.28.1-x86-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.28.0-x86_64-darwin)
google-protobuf (4.28.1-x86_64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.28.0-x86_64-linux)
google-protobuf (4.28.1-x86_64-linux)
bigdecimal
rake (>= 13)
http_parser.rb (0.8.0)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
jekyll (4.3.3)
addressable (~> 2.4)
Expand Down Expand Up @@ -248,7 +248,7 @@ GEM
unicode-display_width (>= 1.1.1, < 3)
typhoeus (1.4.1)
ethon (>= 0.9.0)
unicode-display_width (2.5.0)
unicode-display_width (2.6.0)
uri (0.13.1)
webrick (1.8.1)
word_wrap (1.0.0)
Expand Down
12 changes: 7 additions & 5 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ description: >- # this means to ignore newlines until "baseurl:"
baseurl: "" # the subpath of your site, e.g. /blog
url: "https://duckdb.org" # the base hostname & protocol for your site, e.g. http://example.com
# Set current version of DuckDB
currentshortduckdbversion: "1.0"
currentduckdbversion: 1.0.0
currentsnapshotversion: 1.0.1-dev
currentshortduckdbversion: "1.1"
currentduckdbversion: 1.1.0
currentduckdbhash: "fa5c2fe15f"
currentsnapshotversion: 1.1.1-dev
currentduckdbodbcversion: 1.0.0
# Java
currentjavaversion: 1.0.0
nextjavaversion: 1.1.0 # for java snapshots, should always be the next minor version with a patch version of 0
currentjavaversion: 1.1.0
nextjavaversion: 1.2.0 # for java snapshots, should always be the next minor version with a patch version of 0
livereload: true
highlighter: rouge
incremental: false
Expand Down
Loading

0 comments on commit cdba071

Please sign in to comment.