diff --git a/.codegen.json b/.codegen.json index 1d50897d2..cf2495018 100644 --- a/.codegen.json +++ b/.codegen.json @@ -1 +1 @@ -{ "engineHash": "dd00f3f", "specHash": "ec8720b", "version": "0.1.0" } +{ "engineHash": "7bda2cb", "specHash": "ec8720b", "version": "0.1.0" } diff --git a/.github/workflows/autoupdate-pr.yml b/.github/workflows/autoupdate-pr.yml index 080c51c32..bbf7ad303 100644 --- a/.github/workflows/autoupdate-pr.yml +++ b/.github/workflows/autoupdate-pr.yml @@ -27,7 +27,7 @@ jobs: PR_LIST=$(curl -s -H "Authorization: Bearer ${{ secrets.DISPATCH_ACCESS_TOKEN }}" "https://api.github.com/repos/$GITHUB_REPOSITORY/pulls?state=open" | jq -r '.[] | .head.ref') for pr_branch in $PR_LIST; do git checkout "$pr_branch" - if git merge origin/main; then + if git merge origin/sdk-gen; then git push else # Conflict occurred, resolve by keeping our changes