Merge branch 'main' into main

Masterchief-07 · Jun 9, 2023 · c085cd0 · c085cd0
2 parents a018118 + b7d2aa4
commit c085cd0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/template-janitor.yml b/.github/workflows/template-janitor.yml
@@ -7,10 +7,11 @@ on:
   release:
     types: [published]
   push:
-    tags:
     branches:
       - main
       - develop
+permissions:
+  contents: write
 
 env:
   TEMPLATES_PATH: ".github/template"

diff --git a/README.md b/README.md
@@ -6,9 +6,6 @@
 
 ## About cmake_template
 
-**NOTE** This is undergoing a major overhaul on a new branch currently.
-
-
 This is a C++ Best Practices GitHub template for getting up and running with C++ quickly.
 
 By default (collectively known as `ENABLE_DEVELOPER_MODE`)
@@ -53,7 +50,6 @@ Now you can clone the project locally and get to work!
 
  * [Dependency Setup](README_dependencies.md)
  * [Building Details](README_building.md)
- * [Troubleshooting](README_troubleshooting.md)
  * [Docker](README_docker.md)
 
 ## Testing

diff --git a/README_dependencies.md b/README_dependencies.md
@@ -103,7 +103,7 @@ The following compilers should work:
 	</details>
 
 
-2. [CMake 3.15+](https://cmake.org/)
+2. [CMake 3.21+](https://cmake.org/)
 	<details>
 	<summary>Install Command</summary>