diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml index f71932381a0b..29928d45f0b6 100644 --- a/.github/workflows/combine-prs.yml +++ b/.github/workflows/combine-prs.yml @@ -133,6 +133,7 @@ jobs: git branch $COMBINE_BRANCH_NAME $basebranch git checkout $COMBINE_BRANCH_NAME git pull origin $sourcebranches --no-edit + git rebase origin/main git push origin $COMBINE_BRANCH_NAME # Creates a PR with the new combined branch - uses: actions/github-script@v6 diff --git a/requirements/main.txt b/requirements/main.txt index 611e85337321..01e05476f97f 100644 --- a/requirements/main.txt +++ b/requirements/main.txt @@ -1450,9 +1450,9 @@ stripe==5.2.0 \ --hash=sha256:948482df33c5dc417097bb00c13f8b326f815ef5d1a21d84e697eb53ec5df9fd \ --hash=sha256:a4372b9daf8312d82369aaa64997297a6f046bc07ca09f75d79f5ac80933b414 # via -r requirements/main.in -structlog==22.3.0 \ - --hash=sha256:b403f344f902b220648fa9f286a23c0cc5439a5844d271fec40562dbadbc70ad \ - --hash=sha256:e7509391f215e4afb88b1b80fa3ea074be57a5a17d794bd436a5c949da023333 +structlog==23.1.0 \ + --hash=sha256:270d681dd7d163c11ba500bc914b2472d2b50a8ef00faa999ded5ff83a2f906b \ + --hash=sha256:79b9e68e48b54e373441e130fa447944e6f87a05b35de23138e475c05d0f7e0e # via -r requirements/main.in tenacity==8.1.0 \ --hash=sha256:35525cd47f82830069f0d6b73f7eb83bc5b73ee2fff0437952cedf98b27653ac \