Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modifying Workspace Package #24

Closed
wants to merge 4 commits into from
Closed
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
25 changes: 8 additions & 17 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
name: Deploy

on:
push:
create:
tags:
- "v[0-9]+.[0-9]+.[0-9]+"
- 'v[0-9]+\.[0-9]+\.[0-9]+'
push:
branches:
- "test-ci"

jobs:
build-and-upload:
Expand All @@ -12,34 +15,22 @@ jobs:

strategy:
matrix:
# You can add more, for any target you'd like!
include:
- build: linux
os: ubuntu-latest
target: x86_64-unknown-linux-musl

- build: macos
os: macos-latest
target: x86_64-apple-darwin

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Get the release version from the tag
shell: bash
run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: ${{ matrix.target }}
override: true

- name: Install Rust
run: rustup target add ${{ matrix.target }}

- name: Publish to Cargo
run: |
cargo workspaces publish --verbose --allow-branch * --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
- uses: katyo/publish-crates@v2
with:
registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
5 changes: 5 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
[workspace]
members = ["instruct-macros-types", "instruct-macros", "instructor"]

resolver = "2"

[workspace.package]
version = "0.1.8"
1 change: 0 additions & 1 deletion instruct-macros-types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[package]
name = "instruct-macros-types"
version = "0.1.7"
edition = "2021"
authors = ["Ivan Leo <[email protected]>"]
description = "Instructor Macro Types are a collection of simple types that we export to work with the instruct-macros crate"
Expand Down
3 changes: 1 addition & 2 deletions instruct-macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[package]
name = "instruct-macros"
version = "0.1.7"
edition = "2018"
authors = ["Ivan Leo <[email protected]>"]
description = "instruct-macros are a collection of simple macros that we're using in Instructor-AI to generate json schema from Serde Objects"
Expand All @@ -17,7 +16,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
instruct-macros-types = { path = "../instruct-macros-types", version = "0.1.0" }
instruct-macros-types = { path = "../instruct-macros-types", version = "0.*" }
proc-macro2 = "1.0.86"

[dependencies.syn]
Expand Down
5 changes: 2 additions & 3 deletions instructor/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[package]
name = "instructor-ai"
version = "0.1.7"
edition = "2021"
authors = ["Ivan Leo <[email protected]>"]
description = "instructor-ai is a simple crate that allows for users to do validated structured outputs"
Expand All @@ -13,11 +12,11 @@ license = "MIT OR Apache-2.0"
changelog = "CHANGELOG.md"

[dependencies]
instruct-macros = { path = "../instruct-macros" }
instruct-macros = { path = "../instruct-macros", version = "0.*" }
instruct-macros-types = { path = "../instruct-macros-types", version = "0.*" }
openai-api-rs = "4.1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
instruct-macros-types = { path = "../instruct-macros-types" }

[lib]
name = "instructor_ai"
Expand Down
Loading