Skip to content

Commit

Permalink
fix release of rust client and linux wheel
Browse files Browse the repository at this point in the history
  • Loading branch information
pacman82 committed Jun 2, 2020
1 parent 3a660f6 commit efa9896
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux_wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v2
- name: Build server
run: |
cross build --release --target $THROTTLE_CROSS_COMPILATION_TARGET
cross build --package --throttle-server --release --target $THROTTLE_CROSS_COMPILATION_TARGET
- name: Set up Python
uses: actions/setup-python@v1
with:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/rustpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
env:
CARGO_TOKEN: ${{ secrets.CRATES_IO_TOKEN }}
run: |
cd server && cargo publish --token "${CARGO_TOKEN}"
cd rust_client && cargo publish --token "${CARGO_TOKEN}"
cd -
cd server && cargo publish --token "${CARGO_TOKEN}"
4 changes: 2 additions & 2 deletions python_client/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
name="throttle_client",
version="0.3.9",
author="Markus Klein",
description="Client for Throttle. Throttle is a http semaphore service, providing"
"semaphores for distributed systems.",
description="Client for Throttle. Throttle is an http semaphore service, "
"providing semaphores for distributed systems.",
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/pacman82/throttle.git",
Expand Down
24 changes: 24 additions & 0 deletions rust_client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@ name = "throttle-client"
version = "0.3.9"
authors = ["Markus Klein <markus-klein@live.de>"]
edition = "2018"
license = "MIT"

# Link to github repository
repository = "https://github.com/pacman82/throttle.git"

# A short blurb about the package. This is not rendered in any format when
# uploaded to crates.io (aka this is not markdown).
description = "Client for Throttle. Throttle is an http semaphore service, providing semaphores for distributed systems."

# This is a list of up to five keywords that describe this crate. Keywords
# are searchable on crates.io, and you may choose any words that would
# help someone find this crate.
keywords = ["semaphore", "http"]

# This is a list of up to five categories where this crate would fit.
# Categories are a fixed list available at crates.io/category_slugs, and
# they must match exactly.
categories = ["concurrency"]

# This points to a file under the package root (relative to this `Cargo.toml`).
# The contents of this file are stored and indexed in the registry.
# crates.io will render this file and place the result on the crate's page.
readme = "../Readme.md"


# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class PostInstallCommand(install):
"""Post-installation for installation mode."""

def run(self):
# So ths builds the executable, and even installs it
# So this builds the executable, and even installs it
# but we can't install to the bin directory:
# https://github.com/pypa/setuptools/issues/210#issuecomment-216657975
# take the advice from that comment, and move over after install
Expand All @@ -72,7 +72,7 @@ def run(self):

# setuptools_rust doesn't seem to let me specify a musl cross compilation target
# so instead just build ourselves here =(.
if os.system(f"{command} build --release {compile_args}"):
if os.system(f"{command} build --package throttle-server --release {compile_args}"):
raise ValueError("Failed to compile!")

# run this after trying to build with cargo (as otherwise this leaves
Expand Down

0 comments on commit efa9896

Please sign in to comment.