Skip to content

Commit dd25dda

Browse files
mattKorwelnagendrareddy10
authored andcommitted
more patching (google-gemini#8787)
1 parent 2eb73f7 commit dd25dda

File tree

4 files changed

+18
-0
lines changed

4 files changed

+18
-0
lines changed

.github/actions/publish-release/action.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,3 +149,12 @@ runs:
149149
--title "Release ${{ inputs.release-tag }}" \
150150
--notes-start-tag "${{ inputs.previous-tag }}" \
151151
--generate-notes
152+
153+
- name: '🧹 Clean up release branch'
154+
working-directory: '${{ inputs.working-directory }}'
155+
if: "${{ inputs.dry-run == 'false' }}"
156+
continue-on-error: true
157+
shell: 'bash'
158+
run: |
159+
echo "Cleaning up release branch ${{ steps.release_branch.outputs.BRANCH_NAME }}..."
160+
git push origin --delete "${{ steps.release_branch.outputs.BRANCH_NAME }}"

.github/workflows/e2e.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ on:
1414
types: ['labeled']
1515
merge_group:
1616

17+
concurrency:
18+
group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
19+
cancel-in-progress: |-
20+
${{ github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/heads/release/') }}
21+
1722
jobs:
1823
merge_queue_skipper:
1924
name: 'Merge Queue Skipper'

.github/workflows/release-patch-1-create-pr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,5 @@ jobs:
8787
REPOSITORY: '${{ github.repository }}'
8888
GITHUB_RUN_ID: '${{ github.run_id }}'
8989
run: |
90+
git checkout '${{ github.event.inputs.ref }}'
9091
node scripts/releasing/patch-create-comment.js

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,6 @@ packages/vscode-ide-companion/*.vsix
4949

5050
# GHA credentials
5151
gha-creds-*.json
52+
53+
# Log files
54+
patch_output.log

0 commit comments

Comments
 (0)