chore(deps): update base digest to 25dfb83 (#87)

* chore(deps): update base digest to 25dfb83 * feat(settings): set `allow_squash_merge` to `false` * test: approve new changes --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Dafydd Jones <[email protected]>
dafyddj · Dec 31, 2024 · bb2c5ac · bb2c5ac
1 parent f308ade
commit bb2c5ac
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 1 deletion.
diff --git a/base b/base
diff --git a/template/.github/settings.yml b/template/.github/settings.yml
@@ -0,0 +1 @@
+../template/.github/settings.yml
diff --git a/template/template/.github/settings.yml b/template/template/.github/settings.yml
@@ -0,0 +1,6 @@
+# These settings are synced to GitHub by https://probot.github.io/apps/settings/
+
+repository:
+  # See https://docs.github.com/en/rest/reference/repos#update-a-repository for all available settings.
+
+  allow_squash_merge: false
diff --git a/template/test/GenerateProject/catalogue.tt b/template/test/GenerateProject/catalogue.tt
@@ -3,3 +3,4 @@ The following new files/directories were created:
 ----.copier-answers.yml
 ----.github
 --------renovate.json5
+--------settings.yml
diff --git a/test/GenerateProject/catalogue.tt b/test/GenerateProject/catalogue.tt
@@ -3,6 +3,7 @@ The following new files/directories were created:
 ----.copier-answers.yml
 ----.github
 --------renovate.json5
+--------settings.yml
 --------workflows
 ------------main.yml
 ----.pre-commit-config.yaml
@@ -13,6 +14,7 @@ The following new files/directories were created:
 --------{{ _copier_conf.answers_file }}.copier-jinja
 --------.github
 ------------renovate.json5
+------------settings.yml
 ----test
 --------config.tt
 --------options.tt

diff --git a/test/GenerateProjectWithName/catalogue.tt b/test/GenerateProjectWithName/catalogue.tt
@@ -3,6 +3,7 @@ The following new files/directories were created:
 ----.copier-answers.yml
 ----.github
 --------renovate.json5
+--------settings.yml
 --------workflows
 ------------main.yml
 ----.pre-commit-config.yaml
@@ -13,6 +14,7 @@ The following new files/directories were created:
 --------{{ _copier_conf.answers_file }}.copier-jinja
 --------.github
 ------------renovate.json5
+------------settings.yml
 ----test
 --------config.tt
 --------options.tt

diff --git a/test/GenerateProjectWithName/catalogue_tt.tt b/test/GenerateProjectWithName/catalogue_tt.tt
@@ -3,3 +3,4 @@ The following new files/directories were created:
 ----.copier-answers.yml
 ----.github
 --------renovate.json5
+--------settings.yml
+1 −0		template/.github/settings.yml
+1 −0		test/GenerateProject/catalogue.tt