Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release-jupyter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.target }}
args: --release --out dist
args: --release --out dist --auditwheel=repair
working-directory: ggsql-jupyter

- uses: actions/upload-artifact@v4
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/release-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ jobs:
- name: Install ODBC
run: brew install unixodbc

- name: Install dylibbundler
run: brew install dylibbundler

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
Expand Down Expand Up @@ -136,6 +139,11 @@ jobs:
- name: Build ggsql binary (x86_64)
run: cargo build --release --bin ggsql --bin ggsql-jupyter

- name: Bundle and sign dynamic library dependencies
run: |
dylibbundler -cd -of -b -x target/release/ggsql -d ./libs/ -p @executable_path/../Resources/libs/
dylibbundler -cd -of -b -x target/release/ggsql-jupyter -d ./libs/ -p @executable_path/../Resources/libs/

- name: Ad-hoc sign binaries
run: |
codesign --force --sign - target/release/ggsql
Expand Down Expand Up @@ -175,6 +183,9 @@ jobs:
- name: Install ODBC
run: brew install unixodbc

- name: Install dylibbundler
run: brew install dylibbundler

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
Expand Down Expand Up @@ -206,6 +217,11 @@ jobs:
- name: Build ggsql binary (aarch64)
run: cargo build --release --bin ggsql --bin ggsql-jupyter

- name: Bundle and sign dynamic library dependencies
run: |
dylibbundler -cd -of -b -x target/release/ggsql -d ./libs/ -p @executable_path/../Resources/libs/
dylibbundler -cd -of -b -x target/release/ggsql-jupyter -d ./libs/ -p @executable_path/../Resources/libs/

- name: Build DMG installer (aarch64)
run: cargo packager --release --formats dmg
env:
Expand Down Expand Up @@ -307,6 +323,9 @@ jobs:
- name: Build ggsql binary (aarch64)
run: cargo build --release --bin ggsql --bin ggsql-jupyter

- name: Make empty libs dir for bundling
run: mkdir -p libs

- name: Build Debian package (aarch64)
run: cargo packager --release --formats deb

Expand Down
10 changes: 5 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ default-members = [
resolver = "2"

[workspace.package]
version = "0.2.5"
version = "0.2.6"
edition = "2021"
authors = ["ggsql Team"]
license = "MIT"
Expand All @@ -26,8 +26,8 @@ description = "A declarative visualization language that extends SQL with powerf

[workspace.dependencies]
# workspace packages
tree-sitter-ggsql = { path = "tree-sitter-ggsql", version = "0.2.5" }
ggsql = { path = "src", version = "0.2.5" }
tree-sitter-ggsql = { path = "tree-sitter-ggsql", version = "0.2.6" }
ggsql = { path = "src", version = "0.2.6" }

# Parsing
csscolorparser = "0.8.1"
Expand Down
2 changes: 1 addition & 1 deletion ggsql-jupyter/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "maturin"

[project]
name = "ggsql-jupyter"
version = "0.2.5"
version = "0.2.6"
description = "Jupyter kernel for ggsql - SQL extension for declarative data visualization"
readme = "README.md"
license = { text = "MIT" }
Expand Down
2 changes: 1 addition & 1 deletion ggsql-python/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ggsql-python"
version = "0.2.5"
version = "0.2.6"
edition = "2021"
authors.workspace = true
license.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion ggsql-python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "maturin"

[project]
name = "ggsql"
version = "0.2.5"
version = "0.2.6"
description = "SQL extension for declarative data visualization"
readme = "README.md"
requires-python = ">=3.10"
Expand Down
2 changes: 1 addition & 1 deletion ggsql-python/python/ggsql/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"execute",
"render_altair",
]
__version__ = "0.2.5"
__version__ = "0.2.6"

# Type alias for any Altair chart type
AltairChart = Union[
Expand Down
7 changes: 7 additions & 0 deletions ggsql-vscode/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 0.2.6

Alpha release.

- Set auditwheel=repair for Jupyter macOS builds
- Use dylibbundler to bundle libs on macOS

## 0.2.5

Alpha release.
Expand Down
4 changes: 2 additions & 2 deletions ggsql-vscode/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ggsql-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ggsql",
"displayName": "ggsql",
"description": "Syntax highlighting and language runtime for ggsql - SQL with declarative visualization",
"version": "0.2.5",
"version": "0.2.6",
"publisher": "ggsql",
"engines": {
"vscode": "^1.75.0"
Expand Down
2 changes: 1 addition & 1 deletion ggsql-wasm/demo/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@ binaries = [
]

# Resources to bundle (optional)
resources = []
resources = [{ src = "../libs/", target = "libs" }]
2 changes: 1 addition & 1 deletion tree-sitter-ggsql/bindings/python/__init__.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tree-sitter-ggsql/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tree-sitter-ggsql/pyproject.toml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tree-sitter-ggsql/tree-sitter.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
],
"metadata": {
"version": "0.2.5",
"version": "0.2.6",
"license": "MIT",
"description": "ggsql grammar for tree-sitter",
"authors": [
Expand Down
Loading