Skip to content

Commit

Permalink
Merge branch 'main' into vrongmeal/bson-file-path
Browse files Browse the repository at this point in the history
  • Loading branch information
tychoish authored Jan 13, 2024
2 parents 352a92d + 4590005 commit ec6e51a
Show file tree
Hide file tree
Showing 50 changed files with 563 additions and 454 deletions.
39 changes: 18 additions & 21 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,15 @@ jobs:
path: |
target/
!target/**/glaredb
!target/**/slt
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- uses: actions/cache@v3
name: slt cache
name: glaredb cache
with:
path: target/debug/slt
path: target/debug/glaredb
key: ${{ github.run_id }}
- name: build
run: just build

- name: build slt
run: just build-slt

static-analysis:
name: Lint and Format
runs-on: ubuntu-latest-8-cores
Expand Down Expand Up @@ -127,7 +123,6 @@ jobs:
path: |
target/
!target/**/glaredb
!target/**/slt
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}

- name: build python bindings
Expand Down Expand Up @@ -165,7 +160,6 @@ jobs:
path: |
target/
!target/**/glaredb
!target/**/slt
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: build node.js bindings
run: just js build-debug
Expand Down Expand Up @@ -198,14 +192,13 @@ jobs:
path: |
target/
!target/**/glaredb
!target/**/slt
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: pg protocol test (script)
run: |
PROTOC=`just protoc && just --evaluate PROTOC` ./scripts/protocol-test.sh
- name: pg protocol tests (slt runner)
run: just slt-bin -v 'pgproto/*'
run: just slt-bin-debug 'pgproto/*'

sql-logic-tests:
name: SQL Logic Tests
Expand All @@ -219,25 +212,25 @@ jobs:
uses: actions/checkout@v4
- uses: extractions/setup-just@v1
- uses: actions/cache@v3
name: slt cache
name: glaredb cache
with:
path: target/debug/slt
path: target/debug/glaredb
key: ${{ github.run_id }}
- name: public sql logic tests DEBUG
if: ${{ env.ACTIONS_STEP_DEBUG == 'true' }}
run: |
if [[ "${{ matrix.protocol }}" == "rpc" ]]; then
just rpc-tests
else
just slt-bin -v --protocol=${{ matrix.protocol }} 'sqllogictests/*'
just slt-bin-debug --protocol=${{ matrix.protocol }} 'sqllogictests/*'
fi
- name: public sql logic tests
if: ${{ env.ACTIONS_STEP_DEBUG != 'true' }}
run: |
if [[ "${{ matrix.protocol }}" == "rpc" ]]; then
just rpc-tests
else
just slt-bin -v --protocol=${{ matrix.protocol }} 'sqllogictests/*'
just slt-bin-debug --protocol=${{ matrix.protocol }} 'sqllogictests/*'
fi
process-integration-tests:
Expand Down Expand Up @@ -274,8 +267,12 @@ jobs:
path: |
target/
!target/**/glaredb
!target/**/slt
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- uses: actions/cache@v3
name: glaredb cache
with:
path: target/debug/glaredb
key: ${{ github.run_id }}
- uses: actions/cache@v3
name: py cache
with:
Expand All @@ -297,9 +294,9 @@ jobs:
uses: actions/checkout@v4
- uses: extractions/setup-just@v1
- uses: actions/cache@v3
name: slt cache
name: glaredb cache
with:
path: target/debug/slt
path: target/debug/glaredb
key: ${{ github.run_id }}

- name: GCP authenticate
Expand Down Expand Up @@ -446,9 +443,9 @@ jobs:
uses: actions/checkout@v4
- uses: extractions/setup-just@v1
- uses: actions/cache@v3
name: slt cache
name: glaredb cache
with:
path: target/debug/slt
path: target/debug/glaredb
key: ${{ github.run_id }}
- name: run tests (slt)
run: |
Expand Down Expand Up @@ -477,9 +474,9 @@ jobs:
uses: actions/checkout@v4
- uses: extractions/setup-just@v1
- uses: actions/cache@v3
name: slt cache
name: glaredb cache
with:
path: target/debug/slt
path: target/debug/glaredb
key: ${{ github.run_id }}

- name: snowflake setup (SnowSQL)
Expand Down
30 changes: 21 additions & 9 deletions .github/workflows/nodejs-release.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,35 @@
name: nodejs-release
env:
DEBUG: napi:*
APP_NAME: "glaredb"
MACOSX_DEPLOYMENT_TARGET: "10.13"
PROTOC: "${{ github.workspace }}/deps/protoc/bin/protoc"
permissions:
contents: write
id-token: write
# Build and publish nodejs bindings.
#
# Publishing only happens for tag pushes with the tag beginning with 'v'.
name: nodejs release

on:
schedule:
# Run every Monday at 12:00
- cron: 0 12 * * 1
push:
tags:
- "*"
workflow_dispatch:

defaults:
run:
working-directory: bindings/nodejs

concurrency:
group: nodejs-release-${{ github.ref }}
cancel-in-progress: true

permissions:
contents: write
id-token: write

env:
DEBUG: napi:*
APP_NAME: "glaredb"
MACOSX_DEPLOYMENT_TARGET: "10.13"
PROTOC: "${{ github.workspace }}/deps/protoc/bin/protoc"

jobs:
build:
strategy:
Expand Down Expand Up @@ -127,6 +138,7 @@ jobs:

publish:
name: Publish
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
runs-on: ubuntu-2004-8-cores
needs:
- build
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/python-release.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
# Build and publish python bindings.
#
# Publishing only happens for tag pushes with the tag beginning with 'v'.
name: python release

on:
push:
tags:
- "*"
schedule:
# Run every Monday at 12:00
- cron: 0 12 * * 1
workflow_dispatch:

permissions:
contents: read

env:
PYTHON_VERSION: "3.7"
MATURIN_VERSION: "1.0.1"
MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
MATURIN_USERNAME: "seanglaredb"
PROTOC: "${{ github.workspace }}/deps/protoc/bin/protoc"

jobs:
linux:
runs-on: ubuntu-2004-8-cores
Expand Down Expand Up @@ -104,6 +112,7 @@ jobs:

release:
name: Release
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
runs-on: ubuntu-latest
needs: [linux, macos, windows]
steps:
Expand Down
Loading

0 comments on commit ec6e51a

Please sign in to comment.