Skip to content

Commit 312d90d

Browse files
JamesIvesJamesIves
committed
Merge branch 'dev' into releases/v4
2 parents 682a3da + c251856 commit 312d90d

File tree

5 files changed

+60
-69
lines changed

5 files changed

+60
-69
lines changed

‎__tests__/git.test.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ describe('git', () => {
168168
const response = await deploy(action)
169169

170170
// Includes the call to generateWorktree
171-
expect(execute).toBeCalledTimes(13)
171+
expect(execute).toBeCalledTimes(12)
172172
expect(rmRF).toBeCalledTimes(1)
173173
expect(response).toBe(Status.SUCCESS)
174174
})
@@ -191,7 +191,7 @@ describe('git', () => {
191191
const response = await deploy(action)
192192

193193
// Includes the call to generateWorktree
194-
expect(execute).toBeCalledTimes(12)
194+
expect(execute).toBeCalledTimes(11)
195195
expect(rmRF).toBeCalledTimes(1)
196196
expect(response).toBe(Status.SUCCESS)
197197
})
@@ -216,7 +216,7 @@ describe('git', () => {
216216
await deploy(action)
217217

218218
// Includes the call to generateWorktree
219-
expect(execute).toBeCalledTimes(10)
219+
expect(execute).toBeCalledTimes(11)
220220
expect(rmRF).toBeCalledTimes(1)
221221
})
222222

@@ -240,7 +240,7 @@ describe('git', () => {
240240
await deploy(action)
241241

242242
// Includes the call to generateWorktree
243-
expect(execute).toBeCalledTimes(9)
243+
expect(execute).toBeCalledTimes(10)
244244
expect(rmRF).toBeCalledTimes(1)
245245
})
246246

@@ -265,7 +265,7 @@ describe('git', () => {
265265
await deploy(action)
266266

267267
// Includes the call to generateWorktree
268-
expect(execute).toBeCalledTimes(9)
268+
expect(execute).toBeCalledTimes(10)
269269
expect(rmRF).toBeCalledTimes(1)
270270
})
271271

@@ -296,7 +296,7 @@ describe('git', () => {
296296
const response = await deploy(action)
297297

298298
// Includes the call to generateWorktree
299-
expect(execute).toBeCalledTimes(13)
299+
expect(execute).toBeCalledTimes(12)
300300
expect(rmRF).toBeCalledTimes(1)
301301
expect(fs.existsSync).toBeCalledTimes(2)
302302
expect(response).toBe(Status.SUCCESS)
@@ -328,7 +328,7 @@ describe('git', () => {
328328
await deploy(action)
329329

330330
// Includes the call to generateWorktree
331-
expect(execute).toBeCalledTimes(10)
331+
expect(execute).toBeCalledTimes(9)
332332
expect(rmRF).toBeCalledTimes(1)
333333
})
334334
})
@@ -353,7 +353,7 @@ describe('git', () => {
353353
await deploy(action)
354354

355355
// Includes the call to generateWorktree
356-
expect(execute).toBeCalledTimes(10)
356+
expect(execute).toBeCalledTimes(9)
357357
expect(rmRF).toBeCalledTimes(1)
358358
})
359359

@@ -373,7 +373,7 @@ describe('git', () => {
373373

374374
await deploy(action)
375375

376-
expect(execute).toBeCalledTimes(10)
376+
expect(execute).toBeCalledTimes(9)
377377
expect(rmRF).toBeCalledTimes(1)
378378
expect(mkdirP).toBeCalledTimes(1)
379379
})
@@ -393,7 +393,7 @@ describe('git', () => {
393393
})
394394

395395
const response = await deploy(action)
396-
expect(execute).toBeCalledTimes(10)
396+
expect(execute).toBeCalledTimes(9)
397397
expect(rmRF).toBeCalledTimes(1)
398398
expect(response).toBe(Status.SKIPPED)
399399
})

‎__tests__/main.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ describe('main', () => {
4949
debug: true
5050
})
5151
await run(action)
52-
expect(execute).toBeCalledTimes(15)
52+
expect(execute).toBeCalledTimes(14)
5353
expect(rmRF).toBeCalledTimes(1)
5454
expect(exportVariable).toBeCalledTimes(1)
5555
})
@@ -69,7 +69,7 @@ describe('main', () => {
6969
isTest: TestFlag.HAS_CHANGED_FILES
7070
})
7171
await run(action)
72-
expect(execute).toBeCalledTimes(18)
72+
expect(execute).toBeCalledTimes(17)
7373
expect(rmRF).toBeCalledTimes(1)
7474
expect(exportVariable).toBeCalledTimes(1)
7575
})

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
"devDependencies": {
4242
"@types/jest": "26.0.23",
4343
"@types/node": "15.0.2",
44-
"@typescript-eslint/eslint-plugin": "4.22.1",
45-
"@typescript-eslint/parser": "4.22.1",
44+
"@typescript-eslint/eslint-plugin": "4.23.0",
45+
"@typescript-eslint/parser": "4.23.0",
4646
"eslint": "7.26.0",
4747
"eslint-config-prettier": "8.3.0",
4848
"eslint-plugin-jest": "24.3.6",

‎src/git.ts

+5-14
Original file line numberDiff line numberDiff line change
@@ -208,20 +208,11 @@ export async function deploy(action: ActionInterface): Promise<Status> {
208208
// Cleans up temporary files/folders and restores the git state.
209209
info('Running post deployment cleanup jobs… 🗑️')
210210

211-
if (!action.singleCommit) {
212-
info(`Resetting branch and removing artifacts…`)
213-
await execute(
214-
`git checkout -B ${temporaryDeploymentBranch}`,
215-
`${action.workspace}/${temporaryDeploymentDirectory}`,
216-
action.silent
217-
)
218-
219-
await execute(
220-
`git branch -D ${action.branch} --force`,
221-
action.workspace,
222-
action.silent
223-
)
224-
}
211+
await execute(
212+
`git checkout -B ${temporaryDeploymentBranch}`,
213+
`${action.workspace}/${temporaryDeploymentDirectory}`,
214+
action.silent
215+
)
225216

226217
await execute(
227218
`git worktree remove ${temporaryDeploymentDirectory} --force`,

‎yarn.lock

+41-41
Original file line numberDiff line numberDiff line change
@@ -751,74 +751,74 @@
751751
dependencies:
752752
"@types/yargs-parser" "*"
753753

754-
"@typescript-eslint/eslint-plugin@4.22.1":
755-
version "4.22.1"
756-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.1.tgz#6bcdbaa4548553ab861b4e5f34936ead1349a543"
757-
integrity sha512-kVTAghWDDhsvQ602tHBc6WmQkdaYbkcTwZu+7l24jtJiYvm9l+/y/b2BZANEezxPDiX5MK2ZecE+9BFi/YJryw==
754+
"@typescript-eslint/eslint-plugin@4.23.0":
755+
version "4.23.0"
756+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.23.0.tgz#29d3c9c81f6200b1fd6d8454cfb007ba176cde80"
757+
integrity sha512-tGK1y3KIvdsQEEgq6xNn1DjiFJtl+wn8JJQiETtCbdQxw1vzjXyAaIkEmO2l6Nq24iy3uZBMFQjZ6ECf1QdgGw==
758758
dependencies:
759-
"@typescript-eslint/experimental-utils" "4.22.1"
760-
"@typescript-eslint/scope-manager" "4.22.1"
759+
"@typescript-eslint/experimental-utils" "4.23.0"
760+
"@typescript-eslint/scope-manager" "4.23.0"
761761
debug "^4.1.1"
762762
functional-red-black-tree "^1.0.1"
763763
lodash "^4.17.15"
764764
regexpp "^3.0.0"
765765
semver "^7.3.2"
766766
tsutils "^3.17.1"
767767

768-
"@typescript-eslint/experimental-utils@4.22.1", "@typescript-eslint/experimental-utils@^4.0.1":
769-
version "4.22.1"
770-
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.1.tgz#3938a5c89b27dc9a39b5de63a62ab1623ab27497"
771-
integrity sha512-svYlHecSMCQGDO2qN1v477ax/IDQwWhc7PRBiwAdAMJE7GXk5stF4Z9R/8wbRkuX/5e9dHqbIWxjeOjckK3wLQ==
768+
"@typescript-eslint/experimental-utils@4.23.0", "@typescript-eslint/experimental-utils@^4.0.1":
769+
version "4.23.0"
770+
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.23.0.tgz#f2059434cd6e5672bfeab2fb03b7c0a20622266f"
771+
integrity sha512-WAFNiTDnQfrF3Z2fQ05nmCgPsO5o790vOhmWKXbbYQTO9erE1/YsFot5/LnOUizLzU2eeuz6+U/81KV5/hFTGA==
772772
dependencies:
773773
"@types/json-schema" "^7.0.3"
774-
"@typescript-eslint/scope-manager" "4.22.1"
775-
"@typescript-eslint/types" "4.22.1"
776-
"@typescript-eslint/typescript-estree" "4.22.1"
774+
"@typescript-eslint/scope-manager" "4.23.0"
775+
"@typescript-eslint/types" "4.23.0"
776+
"@typescript-eslint/typescript-estree" "4.23.0"
777777
eslint-scope "^5.0.0"
778778
eslint-utils "^2.0.0"
779779

780-
"@typescript-eslint/parser@4.22.1":
781-
version "4.22.1"
782-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.22.1.tgz#a95bda0fd01d994a15fc3e99dc984294f25c19cc"
783-
integrity sha512-l+sUJFInWhuMxA6rtirzjooh8cM/AATAe3amvIkqKFeMzkn85V+eLzb1RyuXkHak4dLfYzOmF6DXPyflJvjQnw==
780+
"@typescript-eslint/parser@4.23.0":
781+
version "4.23.0"
782+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.23.0.tgz#239315d38e42e852bef43a4b0b01bef78f78911c"
783+
integrity sha512-wsvjksHBMOqySy/Pi2Q6UuIuHYbgAMwLczRl4YanEPKW5KVxI9ZzDYh3B5DtcZPQTGRWFJrfcbJ6L01Leybwug==
784784
dependencies:
785-
"@typescript-eslint/scope-manager" "4.22.1"
786-
"@typescript-eslint/types" "4.22.1"
787-
"@typescript-eslint/typescript-estree" "4.22.1"
785+
"@typescript-eslint/scope-manager" "4.23.0"
786+
"@typescript-eslint/types" "4.23.0"
787+
"@typescript-eslint/typescript-estree" "4.23.0"
788788
debug "^4.1.1"
789789

790-
"@typescript-eslint/scope-manager@4.22.1":
791-
version "4.22.1"
792-
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.22.1.tgz#5bb357f94f9cd8b94e6be43dd637eb73b8f355b4"
793-
integrity sha512-d5bAiPBiessSmNi8Amq/RuLslvcumxLmyhf1/Xa9IuaoFJ0YtshlJKxhlbY7l2JdEk3wS0EnmnfeJWSvADOe0g==
790+
"@typescript-eslint/scope-manager@4.23.0":
791+
version "4.23.0"
792+
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.23.0.tgz#8792ef7eacac122e2ec8fa2d30a59b8d9a1f1ce4"
793+
integrity sha512-ZZ21PCFxPhI3n0wuqEJK9omkw51wi2bmeKJvlRZPH5YFkcawKOuRMQMnI8mH6Vo0/DoHSeZJnHiIx84LmVQY+w==
794794
dependencies:
795-
"@typescript-eslint/types" "4.22.1"
796-
"@typescript-eslint/visitor-keys" "4.22.1"
795+
"@typescript-eslint/types" "4.23.0"
796+
"@typescript-eslint/visitor-keys" "4.23.0"
797797

798-
"@typescript-eslint/types@4.22.1":
799-
version "4.22.1"
800-
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.1.tgz#bf99c6cec0b4a23d53a61894816927f2adad856a"
801-
integrity sha512-2HTkbkdAeI3OOcWbqA8hWf/7z9c6gkmnWNGz0dKSLYLWywUlkOAQ2XcjhlKLj5xBFDf8FgAOF5aQbnLRvgNbCw==
798+
"@typescript-eslint/types@4.23.0":
799+
version "4.23.0"
800+
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.23.0.tgz#da1654c8a5332f4d1645b2d9a1c64193cae3aa3b"
801+
integrity sha512-oqkNWyG2SLS7uTWLZf6Sr7Dm02gA5yxiz1RP87tvsmDsguVATdpVguHr4HoGOcFOpCvx9vtCSCyQUGfzq28YCw==
802802

803-
"@typescript-eslint/typescript-estree@4.22.1":
804-
version "4.22.1"
805-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.1.tgz#dca379eead8cdfd4edc04805e83af6d148c164f9"
806-
integrity sha512-p3We0pAPacT+onSGM+sPR+M9CblVqdA9F1JEdIqRVlxK5Qth4ochXQgIyb9daBomyQKAXbygxp1aXQRV0GC79A==
803+
"@typescript-eslint/typescript-estree@4.23.0":
804+
version "4.23.0"
805+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.23.0.tgz#0753b292097523852428a6f5a1aa8ccc1aae6cd9"
806+
integrity sha512-5Sty6zPEVZF5fbvrZczfmLCOcby3sfrSPu30qKoY1U3mca5/jvU5cwsPb/CO6Q3ByRjixTMIVsDkqwIxCf/dMw==
807807
dependencies:
808-
"@typescript-eslint/types" "4.22.1"
809-
"@typescript-eslint/visitor-keys" "4.22.1"
808+
"@typescript-eslint/types" "4.23.0"
809+
"@typescript-eslint/visitor-keys" "4.23.0"
810810
debug "^4.1.1"
811811
globby "^11.0.1"
812812
is-glob "^4.0.1"
813813
semver "^7.3.2"
814814
tsutils "^3.17.1"
815815

816-
"@typescript-eslint/visitor-keys@4.22.1":
817-
version "4.22.1"
818-
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.1.tgz#6045ae25a11662c671f90b3a403d682dfca0b7a6"
819-
integrity sha512-WPkOrIRm+WCLZxXQHCi+WG8T2MMTUFR70rWjdWYddLT7cEfb2P4a3O/J2U1FBVsSFTocXLCoXWY6MZGejeStvQ==
816+
"@typescript-eslint/visitor-keys@4.23.0":
817+
version "4.23.0"
818+
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.23.0.tgz#7215cc977bd3b4ef22467b9023594e32f9e4e455"
819+
integrity sha512-5PNe5cmX9pSifit0H+nPoQBXdbNzi5tOEec+3riK+ku4e3er37pKxMKDH5Ct5Y4fhWxcD4spnlYjxi9vXbSpwg==
820820
dependencies:
821-
"@typescript-eslint/types" "4.22.1"
821+
"@typescript-eslint/types" "4.23.0"
822822
eslint-visitor-keys "^2.0.0"
823823

824824
abab@^2.0.3:

0 commit comments

Comments
 (0)