diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 95124eb..92309f7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: @@ -12,24 +15,15 @@ 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: @@ -37,9 +31,6 @@ jobs: 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 }} diff --git a/Cargo.toml b/Cargo.toml index dfb4848..69e82ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,2 +1,7 @@ [workspace] members = ["instruct-macros-types", "instruct-macros", "instructor"] + +resolver = "2" + +[workspace.package] +version = "0.1.8" diff --git a/instruct-macros-types/Cargo.toml b/instruct-macros-types/Cargo.toml index a93415f..3a9c9a8 100644 --- a/instruct-macros-types/Cargo.toml +++ b/instruct-macros-types/Cargo.toml @@ -1,6 +1,5 @@ [package] name = "instruct-macros-types" -version = "0.1.7" edition = "2021" authors = ["Ivan Leo "] description = "Instructor Macro Types are a collection of simple types that we export to work with the instruct-macros crate" diff --git a/instruct-macros/Cargo.toml b/instruct-macros/Cargo.toml index aa4995c..caee6b3 100644 --- a/instruct-macros/Cargo.toml +++ b/instruct-macros/Cargo.toml @@ -1,6 +1,5 @@ [package] name = "instruct-macros" -version = "0.1.7" edition = "2018" authors = ["Ivan Leo "] description = "instruct-macros are a collection of simple macros that we're using in Instructor-AI to generate json schema from Serde Objects" @@ -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] diff --git a/instructor/Cargo.toml b/instructor/Cargo.toml index 0b1988c..8dc55c0 100644 --- a/instructor/Cargo.toml +++ b/instructor/Cargo.toml @@ -1,6 +1,5 @@ [package] name = "instructor-ai" -version = "0.1.7" edition = "2021" authors = ["Ivan Leo "] description = "instructor-ai is a simple crate that allows for users to do validated structured outputs" @@ -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"