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 .busbar-ref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
934a016e20fc1a67c209b671d137c8cc28092767 1.6.0
e1d3d8b097201859751d77208e66249d98b50a4b 1.6.0
13 changes: 13 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Dependency updates target dev; they reach main only through a release.
version: 2
updates:
- package-ecosystem: cargo
directory: "/"
target-branch: dev
schedule:
interval: weekly
- package-ecosystem: github-actions
directory: "/"
target-branch: dev
schedule:
interval: weekly
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ permissions:

jobs:
ci:
uses: GetBusbar/busbar/.github/workflows/plugin-ci.yml@934a016e20fc1a67c209b671d137c8cc28092767
uses: GetBusbar/busbar/.github/workflows/plugin-ci.yml@e1d3d8b097201859751d77208e66249d98b50a4b
with:
service: none
busbar_checkout: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/consumer-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ permissions:

jobs:
consumer:
uses: GetBusbar/busbar/.github/workflows/plugin-consumer-verify.yml@934a016e20fc1a67c209b671d137c8cc28092767
uses: GetBusbar/busbar/.github/workflows/plugin-consumer-verify.yml@e1d3d8b097201859751d77208e66249d98b50a4b
with:
version: ${{ inputs.version || '' }}
asset_prefix: busbar-store-sqlite
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ name: release

on:
push:
tags: ["v*", "!v*-*"]
# `vX.Y.Z-dev.N` is a signed PRE-RELEASE from dev (never main/qa); other suffixed tags start nothing.
tags: ["v*", "!v*-*", "v*-dev.*"]
# A tag pushed with GITHUB_TOKEN starts no workflow, so a workflow that tags dispatches this on
# the tag ref (`gh workflow run release.yml --ref <tag>`).
workflow_dispatch: {}
Expand All @@ -20,7 +21,7 @@ permissions:

jobs:
ci:
uses: GetBusbar/busbar/.github/workflows/plugin-ci.yml@934a016e20fc1a67c209b671d137c8cc28092767
uses: GetBusbar/busbar/.github/workflows/plugin-ci.yml@e1d3d8b097201859751d77208e66249d98b50a4b
with:
service: none
busbar_checkout: true
Expand All @@ -29,7 +30,7 @@ jobs:
secrets: inherit
release:
needs: ci
uses: GetBusbar/busbar/.github/workflows/plugin-release.yml@934a016e20fc1a67c209b671d137c8cc28092767
uses: GetBusbar/busbar/.github/workflows/plugin-release.yml@e1d3d8b097201859751d77208e66249d98b50a4b
with:
plugin_crate: busbar-store-sqlite-plugin
manifest_name: busbar-store-sqlite
Expand All @@ -45,7 +46,7 @@ jobs:
consumer-verify:
needs: release
if: ${{ !cancelled() }}
uses: GetBusbar/busbar/.github/workflows/plugin-consumer-verify.yml@934a016e20fc1a67c209b671d137c8cc28092767
uses: GetBusbar/busbar/.github/workflows/plugin-consumer-verify.yml@e1d3d8b097201859751d77208e66249d98b50a4b
with:
version: ${{ github.ref_name }}
asset_prefix: busbar-store-sqlite
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/repin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ permissions:

jobs:
repin:
uses: GetBusbar/busbar/.github/workflows/plugin-repin.yml@934a016e20fc1a67c209b671d137c8cc28092767
uses: GetBusbar/busbar/.github/workflows/plugin-repin.yml@e1d3d8b097201859751d77208e66249d98b50a4b
with:
busbar_sha: ${{ github.event.client_payload.sha || inputs.busbar_sha }}
busbar_version: ${{ github.event.client_payload.version || inputs.busbar_version }}
Expand Down
4 changes: 1 addition & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ Thanks for your interest in improving `busbar-store-sqlite`.

## Layout

Every busbar plugin repo has the same shape. This one is a two-crate Cargo workspace:
`store-sqlite/` holds the plugin's logic and `store-sqlite-plugin/` is the thin `cdylib` that
packages it as a droppable `kind: store` plugin. busbar itself is a git dependency
Every busbar plugin repo has the same skeleton. This one is a two-crate Cargo workspace: `store-sqlite/` holds the plugin's logic and `store-sqlite-plugin/` is the thin `cdylib` that packages it as a droppable `kind: store` plugin. busbar itself is a git dependency
pinned to the commit in `.busbar-ref`. The CI, release and lint configuration are
rendered from [busbar's plugin registry](https://github.com/GetBusbar/busbar/blob/main/plugins.yaml);
change them there, not here.
Expand Down
14 changes: 7 additions & 7 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ publish = false
repository = "https://github.com/GetBusbar/busbar-store-sqlite"

[workspace.dependencies]
busbar-contract = { git = "https://github.com/GetBusbar/busbar", rev = "934a016e20fc1a67c209b671d137c8cc28092767" }
busbar-plugin-loader = { git = "https://github.com/GetBusbar/busbar", rev = "934a016e20fc1a67c209b671d137c8cc28092767" }
busbar-contract = { git = "https://github.com/GetBusbar/busbar", rev = "e1d3d8b097201859751d77208e66249d98b50a4b" }
busbar-plugin-loader = { git = "https://github.com/GetBusbar/busbar", rev = "e1d3d8b097201859751d77208e66249d98b50a4b" }
4 changes: 2 additions & 2 deletions store-sqlite-plugin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
# THE LOGIC, same repo: its `door::door` is the door this image exports.
busbar-store-sqlite = { path = "../store-sqlite" }
busbar-contract = { git = "https://github.com/GetBusbar/busbar", rev = "934a016e20fc1a67c209b671d137c8cc28092767" }
busbar-contract = { git = "https://github.com/GetBusbar/busbar", rev = "e1d3d8b097201859751d77208e66249d98b50a4b" }

[dev-dependencies]
# The conformance and e2e tests load the built cdylib and the linked door over the REAL loader (the
# one dispatcher, the store v3 table) — dev-only, never in the shipped artifact. Same pinned rev as
# the logic crate's busbar-contract, so one busbar source resolves.
busbar-plugin-loader = { git = "https://github.com/GetBusbar/busbar", rev = "934a016e20fc1a67c209b671d137c8cc28092767" }
busbar-plugin-loader = { git = "https://github.com/GetBusbar/busbar", rev = "e1d3d8b097201859751d77208e66249d98b50a4b" }
serde_json = "1"
# Dev-only: the conformance test awaits the store v3 calls (`StoreCalls`), which are futures.
tokio = { version = "1", features = ["rt"] }
Expand Down
2 changes: 1 addition & 1 deletion store-sqlite/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ crate-type = ["rlib"]
# as `busbar_contract::abi::sdk`). Pinned by git rev to the busbar commit in `.busbar-ref`; a busbar
# build that links this crate `[patch]`es the busbar git source to its own tree, so ONE copy of the
# contract links.
busbar-contract = { git = "https://github.com/GetBusbar/busbar", rev = "934a016e20fc1a67c209b671d137c8cc28092767" }
busbar-contract = { git = "https://github.com/GetBusbar/busbar", rev = "e1d3d8b097201859751d77208e66249d98b50a4b" }
# `bundled` compiles SQLite from source so the plugin has no system libsqlite3 dependency at all.
rusqlite = { version = "0.40.0", features = ["bundled"] }
serde_json = "1"
Expand Down
Loading