From 0d3bd68f1a3469511ee135a1e389783f8b157779 Mon Sep 17 00:00:00 2001 From: Jessica Scheick Date: Thu, 28 Mar 2024 16:09:17 -0400 Subject: [PATCH 1/2] use personal access token instead of GH token --- .github/workflows/template-sync.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/template-sync.yaml b/.github/workflows/template-sync.yaml index 96a424e..4e52b88 100644 --- a/.github/workflows/template-sync.yaml +++ b/.github/workflows/template-sync.yaml @@ -22,7 +22,7 @@ jobs: # comment token (and add .github path to .templatesyncignore) # if you do not want actions and workflows updated with: - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GH_PAT }} - name: actions-template-sync uses: AndreasAugustin/actions-template-sync@v2 From 612b084a8d4ced099690e716b53f6e3497e8f9c2 Mon Sep 17 00:00:00 2001 From: Jessica Scheick Date: Thu, 28 Mar 2024 16:50:58 -0400 Subject: [PATCH 2/2] add suggested parameters for force deletion of files --- .github/workflows/template-sync.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/template-sync.yaml b/.github/workflows/template-sync.yaml index 4e52b88..cf504a4 100644 --- a/.github/workflows/template-sync.yaml +++ b/.github/workflows/template-sync.yaml @@ -30,4 +30,5 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} source_repo_path: uwhackweek/jupyterbook-template upstream_branch: main # defaults to main - is_force_deletion: True \ No newline at end of file + is_force_deletion: True + git_remote_pull_params: --allow-unrelated-histories --squash --strategy=recursive -X theirs \ No newline at end of file