Skip to content

Commit

Permalink
Merge pull request #639 from basetenlabs/bump-version-0.7.0
Browse files Browse the repository at this point in the history
Release 0.7.0
  • Loading branch information
squidarth authored Sep 6, 2023
2 parents 07914ea + d9ae02c commit 1b0507c
Show file tree
Hide file tree
Showing 101 changed files with 646 additions and 7,177 deletions.
16 changes: 0 additions & 16 deletions .gitbook.yaml

This file was deleted.

6 changes: 4 additions & 2 deletions .github/workflows/commit_new_release_to_main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Merge release into main

on:
workflow_dispatch:
push:
branches:
- release
Expand All @@ -20,12 +21,13 @@ jobs:
- name: Fetch all branches
run: |
git fetch --all
git fetch --all --unshallow
git pull origin release
- name: Merge release into main with priority on main changes
run: |
git checkout main
git merge --strategy-option=ours origin/release -m "Merge release into main prioritizing main changes"
git merge --strategy-option=ours release -m "Merge release into main prioritizing main changes"
git push origin main
env:
GH_TOKEN: ${{ secrets.BASETENBOT_GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/create_release_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Make PR
run: |
CURR_VERSION=$(curl https://pypi.org/pypi/truss/json | jq ".info.version")
PR_BODY="Updating Truss from [$CURR_VERSION](https://pypi.org/pypi/truss/json) to $INPUT_VERSION."
PR_BODY="Updating Truss from [$CURR_VERSION](https://pypi.org/pypi/truss/json) to $INPUT_VERSION. **PLEASE ENSURE YOU MERGE, NOT SQUASH**"
PR_URL=$(gh pr create --base release --head refs/heads/bump-version-$INPUT_VERSION --title "Release $INPUT_VERSION" --body "$PR_BODY")
env:
INPUT_VERSION: ${{ github.event.inputs.version }}
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ name: PR

on:
pull_request:
paths:
- poetry.lock
- pyproject.yaml
- "truss/**"
- "docs/**"
- .github/workflows/pr.yml

concurrency:
group: pr-${{ github.ref_name }}
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/pre-process.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ predict. So -- let's say you have a model that can handle 5 concurrent requests:
```config.yaml
...
runtime:
predict_concurrency: 10
predict_concurrency: 5
...
```

Expand Down
94 changes: 0 additions & 94 deletions old_docs/CHANGELOG.md

This file was deleted.

33 changes: 0 additions & 33 deletions old_docs/SUMMARY.md

This file was deleted.

Binary file removed old_docs/assets/truss_logo_horizontal.png
Binary file not shown.
Binary file removed old_docs/assets/truss_unify.png
Binary file not shown.
63 changes: 0 additions & 63 deletions old_docs/deploy/baseten.md

This file was deleted.

7 changes: 0 additions & 7 deletions old_docs/deploy/sagemaker.md

This file was deleted.

Loading

0 comments on commit 1b0507c

Please sign in to comment.