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.

Sign up for GitHub

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

Jump to bottom

Update vocodehq-public #637

Merged
merged 2 commits into from
Jul 15, 2024
Merged

Update vocodehq-public #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1cf228
update script (#635)
ajar98 Jul 12, 2024
77d6593
convert logger.error to logger.warning (#636)
ajar98 Jul 15, 2024
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
7 changes: 2 additions & 5 deletions pull_core_into_upstream.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,13 @@ SUBMODULE_BRANCH="vocodehq-public"

USER=$(gh api user | jq -r '.login')
DATE=$(date +%Y%m%d%H%M%S)
FEATURE_BRANCH="${USER}/update-${SUBMODULE_BRANCH}-${DATE}"
PR_TITLE="Update ${SUBMODULE_BRANCH}"
PR_BODY="This PR updates the ${SUBMODULE_BRANCH} branch by merging changes from the main branch."

echo "Creating a new branch ${FEATURE_BRANCH}"

git checkout ${SUBMODULE_BRANCH}
git pull origin ${SUBMODULE_BRANCH}
git checkout main
git pull origin main
git pull origin ${SUBMODULE_BRANCH}
git checkout ${SUBMODULE_BRANCH}
git checkout -b ${FEATURE_BRANCH}
git merge main
gh pr create -t "${PR_TITLE}" -b "${PR_BODY}" -B ${SUBMODULE_BRANCH}
2 changes: 1 addition & 1 deletion vocode/streaming/telephony/client/twilio_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ async def create_call(
) as response:
if not response.ok:
if response.status == 400:
logger.error(
logger.warning(
f"Failed to create call: {response.status} {response.reason} {await response.json()}"
)
raise TwilioBadRequestException(
Expand Down
Loading