Skip to content
Open
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 .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
# SPDX-FileCopyrightText: 2022 Lutris, Inc
# SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
# SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
// SPDX-FileCopyrightText: 2022 Lutris, Inc
// SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
// SPDX-FileContributor: Piper McCorkle <[email protected]>
{
Expand Down
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
# SPDX-FileCopyrightText: 2022 Lutris, Inc
# SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
# SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion .github/actions-rs/grcov.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
# SPDX-FileCopyrightText: 2022 Lutris, Inc
# SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
# SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
# SPDX-FileCopyrightText: 2022 Lutris, Inc
# SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
# SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion .github/ranger.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
# SPDX-FileCopyrightText: 2022 Lutris, Inc
# SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
# SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
49 changes: 25 additions & 24 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
# SPDX-FileCopyrightText: 2022 Lutris, Inc
# SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
# SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand All @@ -23,7 +23,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
toolchain: "1.63"
profile: minimal
override: true
- uses: Swatinem/rust-cache@v1
Expand All @@ -39,7 +39,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
toolchain: "1.63"
components: rustfmt, clippy
profile: minimal
override: true
Expand All @@ -54,15 +54,6 @@ jobs:
args: --all
name: Clippy

security_audit:
name: Security Audit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions-rs/audit-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}

reuse:
name: REUSE
runs-on: ubuntu-latest
Expand Down Expand Up @@ -108,13 +99,6 @@ jobs:
coverage:
name: Test with coverage
runs-on: ubuntu-latest
needs:
- check
- fmt
- security_audit
- reuse
- validate_citation
- docs
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
Expand All @@ -140,20 +124,16 @@ jobs:
test:
name: Test on ${{ matrix.os }} with Rust ${{ matrix.rust }}
runs-on: ${{ matrix.os }}
needs:
- coverage
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
rust:
# Ensure nightly doesn't break anything
- nightly
# Ensure nothing breaks in the next Rust release
- beta
# Ensure nothing breaks in the current Rust release
- stable
# Ensure the MSRV doesn't break
- "1.54"
- "1.63"
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
Expand All @@ -173,3 +153,24 @@ jobs:
cache: "gradle"
- uses: Swatinem/rust-cache@v1
- run: cargo test --all --verbose -- --nocapture

deb:
name: Build Debian packages
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: "1.63"
profile: minimal
override: true
- uses: Swatinem/rust-cache@v1
- run: cargo install cargo-deb cbindgen
- run: cd datom-c && ./run_cbindgen.sh
- run: cargo deb -p datom-c --variant lib
- run: cargo deb -p datom-c --variant dev
- run: sudo apt-get install -y ./target/debian/*.deb
- uses: actions/upload-artifact@v3
with:
name: debian-packages
path: target/debian
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
# SPDX-FileCopyrightText: 2022 Lutris, Inc
# SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
# SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
// SPDX-FileCopyrightText: 2022 Lutris, Inc
// SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
// SPDX-FileContributor: Piper McCorkle <[email protected]>
{
Expand Down
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
// SPDX-FileCopyrightText: 2022 Lutris, Inc
// SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
// SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
// SPDX-FileCopyrightText: 2022 Lutris, Inc
// SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
// SPDX-FileContributor: Piper McCorkle <[email protected]>
{
Expand Down
24 changes: 12 additions & 12 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
# SPDX-FileCopyrightText: 2022 Lutris, Inc
# SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
# SPDX-FileContributor: Piper McCorkle <[email protected]>

cff-version: 1.2.0
message: "If you use this software in your research, please cite it as below."
authors:
- name: "Lutris Engineering, Inc"
address: "102 E Alamo St Ste 200A"
city: "Brenham"
region: "TX"
post-code: 77833
country: "US"
email: "[email protected]"
website: "https://lutris.engineering"
- name: "Lutris, Inc"
address: "102 E Alamo St Ste 200A"
city: "Brenham"
region: "TX"
post-code: 77833
country: "US"
email: "[email protected]"
website: "https://lutris.engineering"
title: "datom-rs"
version: 0.1.1-pre4
date-released: 2021-08-20
url: "https://os.lutris.engineering/datom-rs"
repository-code: "https://github.com/LutrisEng/datom-rs"
license:
- BlueOak-1.0.0
- BSD-2-Clause-Patent
license:
- BlueOak-1.0.0
- BSD-2-Clause-Patent
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!-- SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc -->
<!-- SPDX-FileCopyrightText: 2022 Lutris, Inc -->
<!-- SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent -->
<!-- SPDX-FileContributor: Piper McCorkle <[email protected]> -->

datom-rs is a project of Lutris Engineering, Inc.
datom-rs is a project of Lutris, Inc.

Before you contribute to a Lutris Engineering project, you must sign the
Before you contribute to a Lutris project, you must sign the
Contributor Certificate of Origin. The CCO simply certifies that you
either own your contribution or have the rights to contribute it under
the project's license.
Expand Down Expand Up @@ -38,7 +38,7 @@ you would add the following comment:
// SPDX-FileContributor: John Doe <[email protected]>
```

Contributions on behalf of Lutris Engineering are the only contributions
Contributions on behalf of Lutris are the only contributions
exempt from adding the company's name to the `SPDX-FileContributor`
comment. The `lutris.engineering` email domain name is considered
"well-known" to refer to Lutris Engineering, Inc.
"well-known" to refer to Lutris, Inc.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
# SPDX-FileCopyrightText: 2022 Lutris, Inc
# SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
# SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
15 changes: 7 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc -->
<!-- SPDX-FileCopyrightText: 2022 Lutris, Inc -->
<!-- SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent -->
<!-- SPDX-FileContributor: Piper McCorkle <[email protected]> -->

Expand Down Expand Up @@ -57,7 +57,7 @@ datom = "0.1"

## MSRV

datom-rs is supported with `rustc` 1.54 and newer.
datom-rs is supported with `rustc` 1.63 and newer.

## Sponsors

Expand All @@ -71,15 +71,14 @@ datom-rs is supported with `rustc` 1.54 and newer.
<tbody>
<tr>
<td>
<a href="https://lutris.engineering/?utm_source=lutrisengineering&utm_medium=github&utm_campaign=datom-rs"
title="Lutris Engineering, Inc">
<img alt="Lutris Engineering"
src="https://user-images.githubusercontent.com/1830959/129986000-d00e9309-a657-40a0-8cf4-518a5cd7dfae.png"
<a href="https://lutris.engineering/?utm_source=lutris&utm_medium=github&utm_campaign=datom-rs"
title="Lutris, Inc">
<img alt="Lutris"
src="website/assets/lutris.svg"
width="400" />
</a>
</td>
<td>Lutris Engineering runs the datom-rs project.</td>
<td>Lutris runs the datom-rs project.</td>
</tr>
</tbody>
</table>

2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc -->
<!-- SPDX-FileCopyrightText: 2022 Lutris, Inc -->
<!-- SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent -->
<!-- SPDX-FileContributor: Piper McCorkle <[email protected]> -->

Expand Down
2 changes: 1 addition & 1 deletion datom-c/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
# SPDX-FileCopyrightText: 2022 Lutris, Inc
# SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
# SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
25 changes: 21 additions & 4 deletions datom-c/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
# SPDX-FileCopyrightText: 2022 Lutris, Inc
# SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
# SPDX-FileContributor: Piper McCorkle <[email protected]>

[package]
name = "datom-c"
version = "0.1.1-pre4"
authors = ["Lutris Engineering, Inc <[email protected]>"]
edition = "2018"
authors = ["Lutris, Inc <[email protected]>"]
edition = "2021"
description = "C bindings for an open-source database inspired by Datomic"
readme = "../README.md"
homepage = "https://os.lutris.engineering/datom-rs/"
Expand All @@ -24,4 +24,21 @@ datom = { path = "../datom" }
libc = "0.2"

[build-dependencies]
cbindgen = "0.20"
cbindgen = "0.24"

[package.metadata.deb.variants.lib]
name = "libdatom"
extended-description = "C bindings for an open-source database inspired by Datomic"
depends = "$auto"
assets = [
["target/release/libdatom_c.so", "usr/lib/libdatom.so", "644"],
]

[package.metadata.deb.variants.dev]
name = "libdatom-dev"
depends = "$auto, libdatom"
extended-description = "Development files for C bindings for an open-source database inspired by Datomic"
assets = [
["target/release/libdatom_c.a", "usr/lib/libdatom.a", "644"],
["datom.h", "usr/include/", "644"]
]
2 changes: 1 addition & 1 deletion datom-c/cbindgen.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
# SPDX-FileCopyrightText: 2022 Lutris, Inc
# SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
# SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion datom-c/run_cbindgen.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@rem SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
@rem SPDX-FileCopyrightText: 2022 Lutris, Inc
@rem SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
@rem SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion datom-c/run_cbindgen.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
# SPDX-FileCopyrightText: 2022 Lutris, Inc
# SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
# SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion datom-c/src/connection.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
// SPDX-FileCopyrightText: 2022 Lutris, Inc
// SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
// SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion datom-c/src/database.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
// SPDX-FileCopyrightText: 2022 Lutris, Inc
// SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
// SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion datom-c/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
// SPDX-FileCopyrightText: 2022 Lutris, Inc
// SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
// SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion datom-c/src/misc.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
// SPDX-FileCopyrightText: 2022 Lutris, Inc
// SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
// SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion datom-c/src/sled.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
// SPDX-FileCopyrightText: 2022 Lutris, Inc
// SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
// SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion datom-c/src/structs.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
// SPDX-FileCopyrightText: 2022 Lutris, Inc
// SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
// SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion datom-java/.gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
# SPDX-FileCopyrightText: 2022 Lutris, Inc
# SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
# SPDX-FileContributor: Piper McCorkle <[email protected]>
*.bat text eol=crlf
Expand Down
2 changes: 1 addition & 1 deletion datom-java/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
# SPDX-FileCopyrightText: 2022 Lutris, Inc
# SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
# SPDX-FileContributor: Piper McCorkle <[email protected]>

Expand Down
6 changes: 3 additions & 3 deletions datom-java/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# SPDX-FileCopyrightText: 2021 Lutris Engineering, Inc
# SPDX-FileCopyrightText: 2022 Lutris, Inc
# SPDX-License-Identifier: BlueOak-1.0.0 OR BSD-2-Clause-Patent
# SPDX-FileContributor: Piper McCorkle <[email protected]>

[package]
name = "datom-java"
version = "0.1.1-pre4"
authors = ["Lutris Engineering, Inc <[email protected]>"]
edition = "2018"
authors = ["Lutris, Inc <[email protected]>"]
edition = "2021"
description = "Java bindings for an open-source database inspired by Datomic"
readme = "../README.md"
homepage = "https://os.lutris.engineering/datom-rs/"
Expand Down
Loading