From b9fddf599aa27a6526bf96a51adbd7a23969cbda Mon Sep 17 00:00:00 2001 From: ThatXliner Date: Sat, 10 Jun 2023 08:19:22 -0700 Subject: [PATCH] :construction_worker: Minor CI fixes --- .github/workflows/ci.yml | 4 ++-- Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3efc571..f53eb46 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,10 +15,10 @@ jobs: - name: Install dependencies run: python3 -m pip install --upgrade pip copier poetry poethepoet - name: Create default options - run: echo '{"add_docs":true,"author":"Bryan Hu","email":"bryan.hu.2020@gmail.com","is_app":true,"module_name":"cool_example","project_description":"","project_name":"Cool Example","pypi_name":"cool-example","username":"ThatXliner"}' > env.yml + run: echo '{"add_docs":true,"author":"Bryan Hu","email":"bryan.hu.2020@gmail.com","is_app":true,"module_name":"cool_example","project_description":"","project_name":"Cool Example","pypi_name":"cool-example","username":"ThatXliner"}' > .copier-answers.yml - name: Build example template - run: copier copy gh:ThatXliner/pyt2 . -a env.yml --defaults + run: copier copy gh:ThatXliner/pyt2 . -a .copier-answers.yml --defaults - name: Build example run: | cd cool-example diff --git a/Makefile b/Makefile index 5b50abc..e92b717 100644 --- a/Makefile +++ b/Makefile @@ -4,18 +4,18 @@ all: clean: rm -rf cool-example env.yml setup-env: - echo '{"add_docs":true,"author":"Bryan Hu","email":"bryan.hu.2020@gmail.com","is_app":true,"module_name":"cool_example","project_description":"","project_name":"Cool Example","pypi_name":"cool-example","username":"ThatXliner"}' > env.yml + echo '{"add_docs":true,"author":"Bryan Hu","email":"bryan.hu.2020@gmail.com","is_app":true,"module_name":"cool_example","project_description":"","project_name":"Cool Example","pypi_name":"cool-example","username":"ThatXliner"}' > .copier-answers.yml run: cd cool-example && poetry up && poetry install && poetry update && poetry lock docs: clean $(MAKE) setup-env - copier copy gh:ThatXliner/pyt2 . -a env.yml --defaults -d add_docs=true + copier copy gh:ThatXliner/pyt2 . -a .copier-answers.yml --defaults -d add_docs=true $(MAKE) run cp cool-example/poetry.lock 'template/{{ pypi_name }}/{% if add_docs %}poetry.lock{% endif %}' $(MAKE) clean nodocs: clean $(MAKE) setup-env - copier copy gh:ThatXliner/pyt2 . -a env.yml --defaults -d add_docs=false + copier copy gh:ThatXliner/pyt2 . -a .copier-answers.yml --defaults -d add_docs=false $(MAKE) run cp cool-example/poetry.lock 'template/{{ pypi_name }}/{% if not add_docs %}poetry.lock{% endif %}' $(MAKE) clean