Skip to content

Commit 22d0026

Browse files
authored
Merge branch 'main' into issue_4603
2 parents a284c7d + da5a958 commit 22d0026

File tree

43 files changed

+6855
-706
lines changed

Some content is hidden

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

43 files changed

+6855
-706
lines changed

.bumpversion.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tool.bumpversion]
2-
current_version = "2.0.0-beta.3"
2+
current_version = "2.0.0-beta.5"
33
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)(-(?P<prerelease>(beta|rc))\\.(?P<prerelease_num>\\d+))?"
44
serialize = [
55
"{major}.{minor}.{patch}-{prerelease}.{prerelease_num}",

.github/workflows/docs-deploy.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ jobs:
4040
with:
4141
repository: lancedb/lance-ray
4242
path: lance-ray
43+
- name: Checkout lance-namespace-impls
44+
uses: actions/checkout@v4
45+
with:
46+
repository: lance-format/lance-namespace-impls
47+
path: lance-namespace-impls
4348
- name: Configure Git Credentials
4449
run: |
4550
git config user.name github-actions[bot]
@@ -59,6 +64,14 @@ jobs:
5964
- Namespace Spec: namespace
6065
EOF
6166
cp docs/src/format/namespace/rest.yaml docs/src/rest.yaml
67+
- name: Copy lance-namespace-impls docs
68+
run: |
69+
# Copy implementation specs to the integrations folder
70+
cp lance-namespace-impls/docs/src/*.md docs/src/format/namespace/integrations/
71+
72+
# Copy .pages from lance-namespace-impls and append template entry
73+
cp lance-namespace-impls/docs/src/.pages docs/src/format/namespace/integrations/.pages
74+
echo " - Template for New Integrations: template.md" >> docs/src/format/namespace/integrations/.pages
6275
- name: Copy lance-spark docs
6376
run: |
6477
cp -r lance-spark/docs/src docs/src/integrations/spark
@@ -86,13 +99,15 @@ jobs:
8699
cp lance-ray/CONTRIBUTING.md docs/src/community/project-specific/ray.md
87100
cp lance-spark/CONTRIBUTING.md docs/src/community/project-specific/spark.md
88101
cp lance-namespace/CONTRIBUTING.md docs/src/community/project-specific/namespace.md
102+
cp lance-namespace-impls/CONTRIBUTING.md docs/src/community/project-specific/namespace-impls.md || true
89103
90104
# Create .pages for project-specific
91105
cat > docs/src/community/project-specific/.pages << 'EOF'
92106
nav:
93107
- index.md
94108
- Lance: lance
95109
- Lance Namespace: namespace.md
110+
- Lance Namespace Impls: namespace-impls.md
96111
- Lance Ray: ray.md
97112
- Lance Spark: spark.md
98113
EOF

.github/workflows/java-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,11 @@ jobs:
194194
with:
195195
ref: ${{ inputs.ref }}
196196
- uses: Swatinem/rust-cache@v2
197-
- name: Set up Java 8
197+
- name: Set up Java 11
198198
uses: actions/setup-java@v4
199199
with:
200200
distribution: corretto
201-
java-version: 8
201+
java-version: 11
202202
cache: "maven"
203203
server-id: ossrh
204204
server-username: SONATYPE_USER
@@ -228,7 +228,7 @@ jobs:
228228
working-directory: java
229229
run: |
230230
mvn --batch-mode -DskipTests -Drust.release.build=true package
231-
- name: Publish with Java 8
231+
- name: Publish with Java 11
232232
if: |
233233
github.event_name == 'release' ||
234234
inputs.mode == 'release'

.github/workflows/java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
timeout-minutes: 60
5252
strategy:
5353
matrix:
54-
java-version: [8, 11, 17]
54+
java-version: [11, 17, 21]
5555
name: Build and Test with Java ${{ matrix.java-version }}
5656
steps:
5757
- name: Checkout repository

0 commit comments

Comments
 (0)