diff --git a/__tests__/utils/command.test.ts b/__tests__/utils/command.test.ts index 9ea7b0f..255c799 100644 --- a/__tests__/utils/command.test.ts +++ b/__tests__/utils/command.test.ts @@ -817,7 +817,7 @@ describe('resolveConflicts', () => { 'git config \'user.name\' \'GitHub Actions\'', 'git config \'user.email\' \'example@example.com\'', 'git merge --no-edit origin/feature/new-feature || :', - 'git push origin \'test:refs/heads/test\' || :', + 'git push origin \'test:refs/heads/test\'', ]); }); @@ -920,7 +920,7 @@ describe('resolveConflicts', () => { 'git config \'user.email\' \'example@example.com\'', 'git commit -qm \'commit message\'', 'git show \'--stat-count=10\' HEAD', - 'git push --force origin \'test:refs/heads/test\' || :', + 'git push --force origin \'test:refs/heads/test\'', ]); }); }); diff --git a/package.json b/package.json index 03e5136..199dafa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@technote-space/github-action-pr-helper", - "version": "2.1.8", + "version": "2.1.9", "description": "PullRequest Helper for GitHub Actions.", "keywords": [ "github", @@ -38,7 +38,7 @@ "@actions/github": "^4.0.0", "@octokit/openapi-types": "^4.0.1", "@technote-space/filter-github-action": "^0.5.16", - "@technote-space/github-action-helper": "^4.4.10", + "@technote-space/github-action-helper": "^5.0.0", "moment": "^2.29.1" }, "devDependencies": { @@ -53,7 +53,7 @@ "husky": "^4.3.8", "jest": "^26.6.3", "jest-circus": "^26.6.3", - "lint-staged": "^10.5.3", + "lint-staged": "^10.5.4", "nock": "^13.0.7", "ts-jest": "^26.5.0", "typescript": "^4.1.3" diff --git a/yarn.lock b/yarn.lock index fa29cfa..0f5e27d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -777,10 +777,10 @@ "@actions/core" "^1.2.6" "@actions/github" "^4.0.0" -"@technote-space/github-action-helper@^4.4.10": - version "4.4.10" - resolved "https://registry.yarnpkg.com/@technote-space/github-action-helper/-/github-action-helper-4.4.10.tgz#8797137b62f31d8371edebcea8b6d2deabe0dbca" - integrity sha512-vVcfamU70QDeqU8sYBLad6ek4k/qd2IFEo0KQa1Q4gEXeTMceFm3NIrYfK/0iEoNBXI4LuY2dhr9GH4VBdnhdw== +"@technote-space/github-action-helper@^5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@technote-space/github-action-helper/-/github-action-helper-5.0.0.tgz#dcd1be20c1295a16ac34d6b5751f12a659613963" + integrity sha512-+4KqG6z596vIyDr41Jt48ORur0ZM7gblwYRSQd9nLbNXaU6JRsoHRJ07WiULg6UILpH9LeVghSlnj7cllM4npw== dependencies: "@actions/core" "^1.2.6" "@actions/github" "^4.0.0" @@ -901,9 +901,9 @@ integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== "@types/prettier@^2.0.0": - version "2.1.6" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.6.tgz#f4b1efa784e8db479cdb8b14403e2144b1e9ff03" - integrity sha512-6gOkRe7OIioWAXfnO/2lFiv+SJichKVSys1mSsgyrYHSEjk8Ctv4tSR/Odvnu+HWlH2C8j53dahU03XmQdd5fA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.0.tgz#a4e8205a4955690eef712a6d0394a1d2e121e721" + integrity sha512-O3SQC6+6AySHwrspYn2UvC6tjo6jCTMMmylxZUFhE1CulVu5l3AxU6ca9lrJDTQDVllF62LIxVSx5fuYL6LiZg== "@types/stack-utils@^2.0.0": version "2.0.0" @@ -1930,9 +1930,9 @@ esprima@^4.0.0, esprima@^4.0.1: integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== esquery@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" - integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== dependencies: estraverse "^5.1.0" @@ -2342,9 +2342,9 @@ globby@^11.0.1: slash "^3.0.0" graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: - version "4.2.4" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" - integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== + version "4.2.5" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.5.tgz#bc18864a6c9fc7b303f2e2abdb9155ad178fbe29" + integrity sha512-kBBSQbz2K0Nyn+31j/w36fUfxkBW9/gfwRWdUY1ULReH3iokVJgddZAFcD1D0xlgTmFxJCbUkUclAlc6/IDJkw== growly@^1.3.0: version "1.3.0" @@ -3375,10 +3375,10 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= -lint-staged@^10.5.3: - version "10.5.3" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.3.tgz#c682838b3eadd4c864d1022da05daa0912fb1da5" - integrity sha512-TanwFfuqUBLufxCc3RUtFEkFraSPNR3WzWcGF39R3f2J7S9+iF9W0KTVLfSy09lYGmZS5NDCxjNvhGMSJyFCWg== +lint-staged@^10.5.4: + version "10.5.4" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.4.tgz#cd153b5f0987d2371fc1d2847a409a2fe705b665" + integrity sha512-EechC3DdFic/TdOPgj/RB3FicqE6932LTHCUm0Y2fsD9KGlLB+RwJl2q1IYBIvEsKzDOgn0D4gll+YxG5RsrKg== dependencies: chalk "^4.1.0" cli-truncate "^2.1.0"