Skip to content

Commit aebb662

Browse files
committed
Revert "snapshot uploading: do upload the regular Git for Windows versions"
A couple of weeks ago, when I analyzed why no `upload-snapshots` workflow run was triggered after "merging" the v2.48.1 PR (for details, see #124), I concluded mistakenly that updating the `main` ref would not issue a `push` webhook event. However, the `push` webhook event _is_ triggered. It was simply not handled correctly. Now that I fixed these issues over the course of the preceding commits, it will work. And therefore the code added in above-mentioned PR needs to be dropped lest two `upload-snapshot` workflow runs are triggered to run concurrently. This reverts commit c2b466e (snapshot uploading: do upload the regular Git for Windows versions, 2025-02-13). Signed-off-by: Johannes Schindelin <[email protected]>
1 parent b96bcb6 commit aebb662

File tree

2 files changed

+4
-22
lines changed

2 files changed

+4
-22
lines changed

GitForWindowsHelper/finalize-g4w-release.js

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,5 @@ module.exports = async (context, req) => {
5858
force: false // require fast-forward
5959
})
6060

61-
// trigger "upload artifacts" workflow
62-
const { handlePush } = require('./cascading-runs')
63-
const uploadSnapshotAnswer = await handlePush(context, {
64-
body: {
65-
repository: {
66-
owner: {
67-
login: owner,
68-
},
69-
name: repo,
70-
},
71-
ref: 'refs/heads/main',
72-
after: sha,
73-
}
74-
})
75-
76-
return `Took care of pushing the \`main\` branch to close PR ${prNumber}\n${uploadSnapshotAnswer}`
77-
}
61+
return `Took care of pushing the \`main\` branch to close PR ${prNumber}`
62+
}

__tests__/index.test.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -944,14 +944,11 @@ test('a completed `release-git` run updates the `main` branch in git-for-windows
944944
try {
945945
expect(await index(context, context.req)).toBeUndefined()
946946
expect(context.res).toEqual({
947-
body: [
948-
'Took care of pushing the `main` branch to close PR 765',
949-
`The 'tag-git' workflow run was started at dispatched-workflow-tag-git.yml`,
950-
].join('\n'),
947+
body: `Took care of pushing the \`main\` branch to close PR 765`,
951948
headers: undefined,
952949
status: undefined
953950
})
954-
expect(mockGitHubApiRequest).toHaveBeenCalledTimes(7)
951+
expect(mockGitHubApiRequest).toHaveBeenCalledTimes(4)
955952
expect(mockGitHubApiRequest.mock.calls[3].slice(1)).toEqual([
956953
'installation-access-token',
957954
'PATCH',

0 commit comments

Comments
 (0)