|
33 | 33 | type: 'boolean' |
34 | 34 | default: false |
35 | 35 |
|
| 36 | +concurrency: |
| 37 | + group: '${{ github.workflow }}' |
| 38 | + cancel-in-progress: false |
| 39 | + |
36 | 40 | jobs: |
37 | 41 | release-sdk: |
38 | 42 | runs-on: 'ubuntu-latest' |
@@ -164,19 +168,19 @@ jobs: |
164 | 168 | echo "BRANCH_NAME=${BRANCH_NAME}" >> "${GITHUB_OUTPUT}" |
165 | 169 |
|
166 | 170 | - name: 'Update package version' |
167 | | - working-directory: 'packages/sdk-typescript' |
168 | 171 | env: |
169 | 172 | RELEASE_VERSION: '${{ steps.version.outputs.RELEASE_VERSION }}' |
170 | 173 | run: |- |
171 | | - npm version "${RELEASE_VERSION}" --no-git-tag-version --allow-same-version |
| 174 | + # Use npm workspaces so the root lockfile is updated consistently. |
| 175 | + npm version -w @qwen-code/sdk "${RELEASE_VERSION}" --no-git-tag-version --allow-same-version |
172 | 176 |
|
173 | 177 | - name: 'Commit and Conditionally Push package version' |
174 | 178 | env: |
175 | 179 | BRANCH_NAME: '${{ steps.release_branch.outputs.BRANCH_NAME }}' |
176 | 180 | IS_DRY_RUN: '${{ steps.vars.outputs.is_dry_run }}' |
177 | 181 | RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }}' |
178 | 182 | run: |- |
179 | | - git add packages/sdk-typescript/package.json |
| 183 | + git add packages/sdk-typescript/package.json package-lock.json |
180 | 184 | if git diff --staged --quiet; then |
181 | 185 | echo "No version changes to commit" |
182 | 186 | else |
@@ -245,6 +249,17 @@ jobs: |
245 | 249 |
|
246 | 250 | echo "PR_URL=${pr_url}" >> "${GITHUB_OUTPUT}" |
247 | 251 |
|
| 252 | + - name: 'Wait for CI checks to complete' |
| 253 | + if: |- |
| 254 | + ${{ steps.vars.outputs.is_dry_run == 'false' }} |
| 255 | + env: |
| 256 | + GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' |
| 257 | + PR_URL: '${{ steps.pr.outputs.PR_URL }}' |
| 258 | + run: |- |
| 259 | + set -euo pipefail |
| 260 | + echo "Waiting for CI checks to complete..." |
| 261 | + gh pr checks "${PR_URL}" --watch --interval 30 |
| 262 | +
|
248 | 263 | - name: 'Enable auto-merge for release PR' |
249 | 264 | if: |- |
250 | 265 | ${{ steps.vars.outputs.is_dry_run == 'false' }} |
|
0 commit comments