diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index 3336a62ac..5dbc7b12b 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -123,12 +123,12 @@ def remove_dotgitlabciyml_file(): os.remove(".gitlab-ci.yml") -def remove_dotgithubciyml_file(): - os.remove(".github-ci.yml") +# def remove_dotgithubciyml_file(): +# os.remove(".github-ci.yml") -# def remove_dotgithub_folder(): -# shutil.rmtree(".github") +def remove_dotgithub_folder(): + shutil.rmtree(".github") def append_to_project_gitignore(path): @@ -403,11 +403,11 @@ def main(): if "{{ cookiecutter.ci_tool }}".lower() != "gitlab": remove_dotgitlabciyml_file() - if "{{ cookiecutter.ci_tool }}".lower() != "github": - remove_dotgithubciyml_file() - # if "{{ cookiecutter.ci_tool }}".lower() != "github": - # remove_dotgithub_folder() + # remove_dotgithubciyml_file() + + if "{{ cookiecutter.ci_tool }}".lower() != "github": + remove_dotgithub_folder() if "{{ cookiecutter.use_drf }}".lower() == "n": remove_drf_starter_files() diff --git a/{{cookiecutter.project_slug}}/.github-ci.yml b/{{cookiecutter.project_slug}}/.github-ci.yml deleted file mode 100644 index 0dcbd2f3a..000000000 --- a/{{cookiecutter.project_slug}}/.github-ci.yml +++ /dev/null @@ -1,95 +0,0 @@ -name: Github-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" ] - paths-ignore: [ "docs/**" ] - - push: - branches: [ "master" ] - paths-ignore: [ "docs/**" ] - - - -jobs: - lint: - runs-on: ubuntu-latest - steps: - - - name: Checkout Code Repository - uses: actions/checkout@v2 - - - name: Set up Python 3.8 - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - - name: Install flake8 - run: | - python -m pip install --upgrade pip - pip install flake8 - - - name: Lint with flake8 - run: flake8 - -# With no caching at all the entire ci process takes 4m 30s to complete! - pytest: - runs-on: ubuntu-latest - steps: - - - name: Checkout Code Repository - uses: actions/checkout@v2 - {% if cookiecutter.use_docker == 'y' -%} - - name: Build the Stack - run: docker-compose -f local.yml build - - - name: Make DB Migrations - run: docker-compose -f local.yml run --rm django python manage.py migrate - - - name: Run the Stack - run: docker-compose -f local.yml up -d - - - name: Run Django Tests - run: docker-compose exec -T django pytest - - - name: Tear down the Stack - run: docker-compose down - {%- else %} - - - name: Set up Python 3.8 - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - - name: Get pip cache dir - id: pip-cache-location - run: | - echo "::set-output name=dir::$(pip cache dir)" - - - name: Cache pip Project Dependencies - uses: actions/cache@v2 - with: - # Get the location of pip cache dir - path: ${{ steps.pip-cache-location.outputs.dir }} - # Look to see if there is a cache hit for the corresponding requirements file - key: ${{ runner.os }}-pip-${{ hashFiles('**/local.txt') }} - restore-keys: | - ${{ runner.os }}-pip- - - - name: Install Dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements/local.txt - - - name: Test with pytest - run: pytest - - - {%- endif %}