Skip to content

Improve Makefile and workflow #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
May 11, 2020
Merged

Improve Makefile and workflow #25

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5f0dbe2
Add support to pomerge
rffontenelle May 10, 2020
7a81b2a
Makefile: avoid OLDPWD in tx-config
rffontenelle May 10, 2020
90fd961
Makefile: do not echo command lines
rffontenelle May 10, 2020
fc624b1
Makefile: Reorganize venv
rffontenelle May 10, 2020
fd4afdc
Makefile: reorganize variables
rffontenelle May 10, 2020
a8ed9bd
Makefile: Adjust targets' documentation
rffontenelle May 10, 2020
c005789
Makefile: no-single-branch cpython
rffontenelle May 10, 2020
35d4469
workflow: update modules, do not set python version
rffontenelle May 10, 2020
49bc17f
workflow: reorganize instructions
rffontenelle May 10, 2020
d0f57e8
Update translations from Transifex
github-actions[bot] May 11, 2020
9adc937
Merge branch '3.8' into 3.8
rffontenelle May 11, 2020
8a188c8
workflow: rollback the workflow name
rffontenelle May 11, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Makefile: no-single-branch cpython 
Doing shallow clone (--depth 1) didn't make possible to checkout other branches of CPython, which could be useful for using this script in other branches at some point, e.g. building Python docs.
  • Loading branch information
@rffontenelle
rffontenelle committed May 10, 2020
commit c005789f0be10b68e37bd7ee696bc5ff12eae728
8 changes: 5 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ build: setup
html

@echo "Success! Open file://$(CPYTHON_WORKDIR)/Doc/build/html/index.html, " \
"or run 'make serve' to see them in http://localhost:8000";
"or run 'make serve' to see them in http://localhost:8000";


# push: push changed translation files and Transifex config file to repository.
Expand Down Expand Up @@ -151,9 +151,11 @@ pot: setup
setup: venv
@if ! [ -d $(CPYTHON_PATH) ]; then \
echo "CPython repo not found; cloning ..."; \
git clone --depth 1 --branch $(BRANCH) $(UPSTREAM) $(CPYTHON_PATH); \
git clone --depth 1 --no-single-branch $(UPSTREAM) $(CPYTHON_PATH); \
git -C $(CPYTHON_PATH) checkout $(BRANCH); \
else \
echo "CPython repo found; updating ..."; \
git -C $(CPYTHON_PATH) checkout $(BRANCH); \
git -C $(CPYTHON_PATH) pull --rebase; \
fi

Expand All @@ -166,7 +168,7 @@ setup: venv
VENVDIR=$(CPYTHON_WORKDIR)/Doc/venv \
PYTHON=$(PYTHON) venv; \
else \
echo "CPython repo already ready in workdir"; \
echo "CPython repo already ready in workdir"; \
fi

@echo "Setting up translation files in workdir ..."
Expand Down