From c061fba40ef3517c713558ebf64ca15badc9b0d2 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Sat, 19 Sep 2020 02:31:07 +0530
Subject: [PATCH] Added {% raw %} and {% endraw %} to allow jinja to parse the
 tempaltes correctly.

---
 docs/project-generation-options.rst                    |  2 +-
 tests/test_cookiecutter_generation.py                  |  2 +-
 .../.github/workflows/{.github-ci.yml => ci.yml}       | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename {{cookiecutter.project_slug}}/.github/workflows/{.github-ci.yml => ci.yml} (98%)

diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 458edf048..54617f754 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -177,4 +177,4 @@ debug:
 
 .. _GitLab CI: https://docs.gitlab.com/ee/ci/
 
-.. _Github CI: https://docs.github.com/en/actions
+.. _Github Actions: https://docs.github.com/en/actions
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 172f50ec9..bbee8db35 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -245,7 +245,7 @@ def test_github_invokes_flake8_and_pytest(
     assert result.project.basename == context["project_slug"]
     assert result.project.isdir()
 
-    with open(f"{result.project}/.github/workflows/.github-ci.yml", "r") as github_yml:
+    with open(f"{result.project}/.github/workflows/ci.yml", "r") as github_yml:
         try:
             github_config = yaml.safe_load(github_yml)
             assert github_config["flake8"]["script"] == ["flake8"]
diff --git a/{{cookiecutter.project_slug}}/.github/workflows/.github-ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
similarity index 98%
rename from {{cookiecutter.project_slug}}/.github/workflows/.github-ci.yml
rename to {{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 0dcbd2f3a..abbc3e3f6 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/.github-ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -1,12 +1,10 @@
-name: Github-CI
+name: CI
 
 # Enable Buildkit and let compose use it to speed up image building
 env:
   DOCKER_BUILDKIT: 1
   COMPOSE_DOCKER_CLI_BUILD: 1
 
-
-
 on:
   pull_request:
     branches: [ "master" ]
@@ -17,7 +15,6 @@ on:
     paths-ignore: [ "docs/**" ]
 
 
-
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -47,6 +44,7 @@ jobs:
       - name: Checkout Code Repository
         uses: actions/checkout@v2
     {% if cookiecutter.use_docker == 'y' -%}
+
       - name: Build the Stack
         run:  docker-compose -f local.yml build
 
@@ -61,6 +59,7 @@ jobs:
 
       - name: Tear down the Stack
         run:  docker-compose down
+
     {%- else %}
 
       - name: Set up Python 3.8
@@ -73,6 +72,7 @@ jobs:
         run: |
           echo "::set-output name=dir::$(pip cache dir)"
 
+    {% raw %}
       - name: Cache pip Project Dependencies
         uses: actions/cache@v2
         with:
@@ -82,6 +82,7 @@ jobs:
           key: ${{ runner.os }}-pip-${{ hashFiles('**/local.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
+    {% endraw %}
 
       - name: Install Dependencies
         run: |
@@ -91,5 +92,4 @@ jobs:
       - name: Test with pytest
         run:  pytest
 
-
     {%- endif %}