From bda5ade93c911e31761cd3de26f6df3d5b00f88f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 12:10:29 +0000 Subject: [PATCH 1/5] build(deps-dev): bump @types/node from 18.19.23 to 18.19.25 (#2826) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.19.23 to 18.19.25. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 908d852b1a..b0399b4c4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ }, "devDependencies": { "@types/jest": "^29.5.12", - "@types/node": "^18.19.23", + "@types/node": "^18.19.25", "@typescript-eslint/parser": "^5.62.0", "@vercel/ncc": "^0.38.1", "eslint": "^8.57.0", @@ -1656,9 +1656,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.19.23", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.23.tgz", - "integrity": "sha512-wtE3d0OUfNKtZYAqZb8HAWGxxXsImJcPUAgZNw+dWFxO6s5tIwIjyKnY76tsTatsNCLJPkVYwUpq15D38ng9Aw==", + "version": "18.19.25", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.25.tgz", + "integrity": "sha512-NrNXHJCexZtcbR9K1hsv1fSbwAwnhv7ql7l331aKvW0sej5H0NY1o64BHe0AA2ZoQuTm7NE6fyNW079MOWXe4Q==", "dev": true, "dependencies": { "undici-types": "~5.26.4" diff --git a/package.json b/package.json index 74c16db676..c8528e84e7 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ }, "devDependencies": { "@types/jest": "^29.5.12", - "@types/node": "^18.19.23", + "@types/node": "^18.19.25", "@typescript-eslint/parser": "^5.62.0", "@vercel/ncc": "^0.38.1", "eslint": "^8.57.0", From 8500972a1322d52aebd0e3050bc201599f71661f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 13:01:53 +0000 Subject: [PATCH 2/5] build(deps-dev): bump @types/node from 18.19.25 to 18.19.26 (#2831) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.19.25 to 18.19.26. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index b0399b4c4c..661239cbcb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ }, "devDependencies": { "@types/jest": "^29.5.12", - "@types/node": "^18.19.25", + "@types/node": "^18.19.26", "@typescript-eslint/parser": "^5.62.0", "@vercel/ncc": "^0.38.1", "eslint": "^8.57.0", @@ -1656,9 +1656,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.19.25", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.25.tgz", - "integrity": "sha512-NrNXHJCexZtcbR9K1hsv1fSbwAwnhv7ql7l331aKvW0sej5H0NY1o64BHe0AA2ZoQuTm7NE6fyNW079MOWXe4Q==", + "version": "18.19.26", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.26.tgz", + "integrity": "sha512-+wiMJsIwLOYCvUqSdKTrfkS8mpTp+MPINe6+Np4TAGFWWRWiBQ5kSq9nZGCSPkzx9mvT+uEukzpX4MOSCydcvw==", "dev": true, "dependencies": { "undici-types": "~5.26.4" diff --git a/package.json b/package.json index c8528e84e7..06b87ac80a 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ }, "devDependencies": { "@types/jest": "^29.5.12", - "@types/node": "^18.19.25", + "@types/node": "^18.19.26", "@typescript-eslint/parser": "^5.62.0", "@vercel/ncc": "^0.38.1", "eslint": "^8.57.0", From 36ef0ed92fad84020ab7eb31a226f860a2b8a886 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 12:06:50 +0000 Subject: [PATCH 3/5] build(deps-dev): bump @types/node from 18.19.26 to 18.19.28 (#2836) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.19.26 to 18.19.28. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 661239cbcb..eafa596ea6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ }, "devDependencies": { "@types/jest": "^29.5.12", - "@types/node": "^18.19.26", + "@types/node": "^18.19.28", "@typescript-eslint/parser": "^5.62.0", "@vercel/ncc": "^0.38.1", "eslint": "^8.57.0", @@ -1656,9 +1656,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.19.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.26.tgz", - "integrity": "sha512-+wiMJsIwLOYCvUqSdKTrfkS8mpTp+MPINe6+Np4TAGFWWRWiBQ5kSq9nZGCSPkzx9mvT+uEukzpX4MOSCydcvw==", + "version": "18.19.28", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.28.tgz", + "integrity": "sha512-J5cOGD9n4x3YGgVuaND6khm5x07MMdAKkRyXnjVR6KFhLMNh2yONGiP7Z+4+tBOt5mK+GvDTiacTOVGGpqiecw==", "dev": true, "dependencies": { "undici-types": "~5.26.4" diff --git a/package.json b/package.json index 06b87ac80a..b499eec34c 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ }, "devDependencies": { "@types/jest": "^29.5.12", - "@types/node": "^18.19.26", + "@types/node": "^18.19.28", "@typescript-eslint/parser": "^5.62.0", "@vercel/ncc": "^0.38.1", "eslint": "^8.57.0", From 6ce4eca6b6db0ff4f4d1b542dce50e785446dc27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 12:26:55 +0000 Subject: [PATCH 4/5] build(deps-dev): bump @types/node from 18.19.28 to 18.19.31 (#2842) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.19.28 to 18.19.31. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index eafa596ea6..cff2965b59 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ }, "devDependencies": { "@types/jest": "^29.5.12", - "@types/node": "^18.19.28", + "@types/node": "^18.19.31", "@typescript-eslint/parser": "^5.62.0", "@vercel/ncc": "^0.38.1", "eslint": "^8.57.0", @@ -1656,9 +1656,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.19.28", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.28.tgz", - "integrity": "sha512-J5cOGD9n4x3YGgVuaND6khm5x07MMdAKkRyXnjVR6KFhLMNh2yONGiP7Z+4+tBOt5mK+GvDTiacTOVGGpqiecw==", + "version": "18.19.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", + "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", "dev": true, "dependencies": { "undici-types": "~5.26.4" diff --git a/package.json b/package.json index b499eec34c..960614df4a 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ }, "devDependencies": { "@types/jest": "^29.5.12", - "@types/node": "^18.19.28", + "@types/node": "^18.19.31", "@typescript-eslint/parser": "^5.62.0", "@vercel/ncc": "^0.38.1", "eslint": "^8.57.0", From c55203cfde3e5c11a452d352b4393e68b85b4533 Mon Sep 17 00:00:00 2001 From: Peter Evans <18365890+peter-evans@users.noreply.github.com> Date: Fri, 12 Apr 2024 18:18:19 +0900 Subject: [PATCH 5/5] fix: drop unnecessary fetch with unshallow on push-to-fork (#2849) --- dist/index.js | 14 +++----------- src/create-or-update-branch.ts | 18 +++--------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/dist/index.js b/dist/index.js index 57130a6267..b410e361d3 100644 --- a/dist/index.js +++ b/dist/index.js @@ -164,20 +164,12 @@ function createOrUpdateBranch(git, commitMessage, base, branch, branchRemoteName } // Stash any uncommitted tracked and untracked changes const stashed = yield git.stashPush(['--include-untracked']); - // Perform fetch and reset the working base + // Reset the working base // Commits made during the workflow will be removed if (workingBaseType == WorkingBaseType.Branch) { core.info(`Resetting working base branch '${workingBase}'`); - if (branchRemoteName == 'fork') { - // If pushing to a fork we must fetch with 'unshallow' to avoid the following error on git push - // ! [remote rejected] HEAD -> tests/push-branch-to-fork (shallow update not allowed) - yield git.fetch([`${workingBase}:${workingBase}`], baseRemote, ['--force'], true); - } - else { - // If the remote is 'origin' we can git reset - yield git.checkout(workingBase); - yield git.exec(['reset', '--hard', `${baseRemote}/${workingBase}`]); - } + yield git.checkout(workingBase); + yield git.exec(['reset', '--hard', `${baseRemote}/${workingBase}`]); } // If the working base is not the base, rebase the temp branch commits // This will also be true if the working base type is a commit diff --git a/src/create-or-update-branch.ts b/src/create-or-update-branch.ts index 000dc513d6..4d489dd35d 100644 --- a/src/create-or-update-branch.ts +++ b/src/create-or-update-branch.ts @@ -173,24 +173,12 @@ export async function createOrUpdateBranch( // Stash any uncommitted tracked and untracked changes const stashed = await git.stashPush(['--include-untracked']) - // Perform fetch and reset the working base + // Reset the working base // Commits made during the workflow will be removed if (workingBaseType == WorkingBaseType.Branch) { core.info(`Resetting working base branch '${workingBase}'`) - if (branchRemoteName == 'fork') { - // If pushing to a fork we must fetch with 'unshallow' to avoid the following error on git push - // ! [remote rejected] HEAD -> tests/push-branch-to-fork (shallow update not allowed) - await git.fetch( - [`${workingBase}:${workingBase}`], - baseRemote, - ['--force'], - true - ) - } else { - // If the remote is 'origin' we can git reset - await git.checkout(workingBase) - await git.exec(['reset', '--hard', `${baseRemote}/${workingBase}`]) - } + await git.checkout(workingBase) + await git.exec(['reset', '--hard', `${baseRemote}/${workingBase}`]) } // If the working base is not the base, rebase the temp branch commits