Skip to content

chore: merge production into staging (preserve merge commit)#697

Merged
jirhiker merged 18 commits into
stagingfrom
merge/production-into-staging-2
Jun 8, 2026
Merged

chore: merge production into staging (preserve merge commit)#697
jirhiker merged 18 commits into
stagingfrom
merge/production-into-staging-2

Conversation

@jirhiker

@jirhiker jirhiker commented Jun 8, 2026

Copy link
Copy Markdown
Member

Why

  • Re-resolve conflicts blocking #695. #696 was squash-merged, which stripped the merge commit, so production is still not an ancestor of staging and PR build(release): v1.1 #695 re-reports CONFLICTING.

How

  • Real merge commit of origin/production into staging.
  • Same resolutions as chore: merge production into staging #696: keep staging versions (authlib 1.7.2, idna 3.18, semantic-pull-request@v6, release-please-action@v5).
  • uv lock --check passes.

Notes

  • MUST be merged via "Create a merge commit" — not squash, not rebase. Squashing this PR again will reproduce the same conflict on build(release): v1.1 #695.

jirhiker and others added 18 commits September 11, 2025 20:46
feat: add production deployment configuration for Google Cloud
Bumps [authlib](https://github.com/authlib/authlib) from 1.6.1 to 1.6.4.
- [Release notes](https://github.com/authlib/authlib/releases)
- [Changelog](https://github.com/authlib/authlib/blob/main/docs/changelog.rst)
- [Commits](authlib/authlib@v1.6.1...v1.6.4)

---
updated-dependencies:
- dependency-name: authlib
  dependency-version: 1.6.4
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
…lib-1.6.4

build(deps): bump authlib from 1.6.1 to 1.6.4
Bumps [authlib](https://github.com/authlib/authlib) from 1.6.4 to 1.6.5.
- [Release notes](https://github.com/authlib/authlib/releases)
- [Changelog](https://github.com/authlib/authlib/blob/main/docs/changelog.rst)
- [Commits](authlib/authlib@v1.6.4...v1.6.5)

---
updated-dependencies:
- dependency-name: authlib
  dependency-version: 1.6.5
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
…lib-1.6.5

build(deps): bump authlib from 1.6.4 to 1.6.5
<!--
- Title the PR with the JIRA project & ticket number and short
description (e.g., BDMS-123: Example display bug), or NO TICKET
- Keep sections short and scannable.
-->
### **Why**
_This PR addresses the following problem / context:_
- Use bullet points here

### **How**
_Implementation summary - the following was changed / added / removed:_
- Use bullet points here

### **Notes**
_Any special considerations, workarounds, or follow-up work to note?_
- Use bullet points here

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Jeremy Zilar <jeremyzilar@gmail.com>
Co-authored-by: jeremyzilar <395641+jeremyzilar@users.noreply.github.com>
Co-authored-by: Jeremy Zilar <jeremy.zilar@lakeraven.com>
Co-authored-by: Kelsey Smuczynski <ksmuczynski@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tyler Adam Martinez <TylerAdamMartinez@outlook.com>
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
# Conflicts:
#	.github/workflows/pr-title-lint.yml
#	.github/workflows/release-please.yml
#	pyproject.toml
#	requirements.txt
#	uv.lock
Copilot AI review requested due to automatic review settings June 8, 2026 16:52

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review any files in this pull request.

@jirhiker jirhiker merged commit f47d4a9 into staging Jun 8, 2026
8 of 9 checks passed
@jirhiker jirhiker deleted the merge/production-into-staging-2 branch June 8, 2026 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants