Skip to content

Commit 37a96a5

Browse files
committed
fix sourceVersion handling for the source override use case
1 parent 45335c2 commit 37a96a5

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

code-build.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,10 @@ function inputs2Parameters(inputs) {
306306

307307
const sourceOverride = !disableSourceOverride
308308
? {
309-
sourceVersion: sourceVersion,
309+
// sourceVersion should not be set when using sourceTypeOverride or sourceLocationOverride
310+
...(sourceTypeOverride || sourceLocationOverride
311+
? {}
312+
: {sourceVersion}),
310313
sourceTypeOverride: sourceTypeOverride || "GITHUB",
311314
sourceLocationOverride: sourceLocationOverride || `https://github.com/${owner}/${repo}.git`,
312315
}

dist/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,10 @@ function inputs2Parameters(inputs) {
312312

313313
const sourceOverride = !disableSourceOverride
314314
? {
315-
sourceVersion: sourceVersion,
315+
// sourceVersion should not be set when using sourceTypeOverride or sourceLocationOverride
316+
...(sourceTypeOverride || sourceLocationOverride
317+
? {}
318+
: {sourceVersion}),
316319
sourceTypeOverride: sourceTypeOverride || "GITHUB",
317320
sourceLocationOverride: sourceLocationOverride || `https://github.com/${owner}/${repo}.git`,
318321
}

test/code-build-test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@ describe("inputs2Parameters", () => {
431431
});
432432
expect(test).to.haveOwnProperty("sourceTypeOverride").and.to.equal("S3");
433433
expect(test).to.haveOwnProperty("sourceLocationOverride").and.to.equal("bucket-name/object-name");
434+
expect(test).to.not.haveOwnProperty("sourceVersion");
434435
});
435436

436437
it("can process disable-github-env-vars", () => {

0 commit comments

Comments
 (0)