From adc68a3e8138ae8d5a6862f695f16ccb74a02744 Mon Sep 17 00:00:00 2001 From: Matt Armstrong Date: Fri, 17 Dec 2021 10:26:49 -0800 Subject: [PATCH 1/2] Switch from git to http remote URL in about-git-subtree-merges.md --- content/get-started/using-git/about-git-subtree-merges.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/get-started/using-git/about-git-subtree-merges.md b/content/get-started/using-git/about-git-subtree-merges.md index d807a05e15..3fdd7bdf1d 100644 --- a/content/get-started/using-git/about-git-subtree-merges.md +++ b/content/get-started/using-git/about-git-subtree-merges.md @@ -52,7 +52,7 @@ The best way to explain subtree merges is to show by example. We will: 1. Add a new remote URL pointing to the separate project that we're interested in. ```shell - $ git remote add -f spoon-knife git@github.com:octocat/Spoon-Knife.git + $ git remote add -f spoon-knife https://github.com/octocat/Spoon-Knife.git > Updating spoon-knife > warning: no common commits > remote: Counting objects: 1732, done. @@ -60,7 +60,7 @@ The best way to explain subtree merges is to show by example. We will: > remote: Total 1732 (delta 1086), reused 1558 (delta 967) > Receiving objects: 100% (1732/1732), 528.19 KiB | 621 KiB/s, done. > Resolving deltas: 100% (1086/1086), done. - > From git://github.com/octocat/Spoon-Knife + > From https://github.com/octocat/Spoon-Knife > * [new branch] main -> Spoon-Knife/main ``` 2. Merge the `Spoon-Knife` project into the local Git project. This doesn't change any of your files locally, but it does prepare Git for the next step. From dd6a18f79def36193b03ca744f1edf50e787fd26 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Mon, 31 Jan 2022 12:12:22 -0500 Subject: [PATCH 2/2] Revert "unbreak repo-sync by fixing the staging deploy workflow (#14761)" This reverts commit 54bfe1936c24ef1567c21e82c3b5aab9202cb82d. --- .github/workflows/staging-deploy-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/staging-deploy-pr.yml b/.github/workflows/staging-deploy-pr.yml index 650f329a22..52c382a675 100644 --- a/.github/workflows/staging-deploy-pr.yml +++ b/.github/workflows/staging-deploy-pr.yml @@ -71,7 +71,7 @@ jobs: // the API for more info based on the originating workflow run const { BUILD_ACTIONS_RUN_ID } = process.env const { owner, repo } = context.repo - const { data: run } = await github.rest.actions.getWorkflowRun({ + const { data: run } = await github.actions.getWorkflowRun({ owner, repo, run_id: BUILD_ACTIONS_RUN_ID,