From b392c8214ec0c120ab2b501515bed0052f6000b4 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Thu, 17 Dec 2020 13:49:05 +0100 Subject: [PATCH 1/5] Workaround Python upgrades and venv caching. --- .github/workflows/tests.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3aee66bc9..596994415 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -81,6 +81,10 @@ jobs: cp -uv --parents *.po */*.po ~/locales/fr/LC_MESSAGES/ git -C ~/cpython checkout b30934e9afb0af3f8e2e5f0992445be775b3c630 - name: Prepare venv - run: make -C $HOME/cpython/Doc venv + run: | + # If the venv exists but is broken, drop it (happens on Python upgrades): + # see https://github.com/actions/setup-python/issues/170 + [ -d $HOME/cpython/Doc/venv/bin/ -a ! -e $HOME/cpython/Doc/venv/bin/python ] && rm -fr $HOME/cpython/Doc/venv + make -C $HOME/cpython/Doc venv - name: sphinx-build run: make -C $HOME/cpython/Doc SPHINXOPTS="-qW -j4 -D locale_dirs=$HOME/locales -D language=fr -D gettext_compact=0" autobuild-dev-html From 0169699de9640eefdab477594a93244966944dc6 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Thu, 17 Dec 2020 14:06:37 +0100 Subject: [PATCH 2/5] Better handling of 'grep -v' suffix for padpo. --- .github/workflows/tests.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 596994415..4b6c61a7f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,15 +18,14 @@ jobs: - name: Orthographe package: pospell apt_dependencies: hunspell hunspell-fr-comprehensive - command: pospell -p dict -l fr_FR + command: 'pospell -p dict -l fr_FR $CHANGED_PO_FILES' - name: Longueur des lignes package: powrap apt_dependencies: gettext - command: powrap --check --quiet --diff + command: 'powrap --check --quiet --diff $CHANGED_PO_FILES' - name: Grammaire package: padpo - command: 'padpo -i 2>&1' - command_suffix: '| grep -v -Ff padpo.ignore' + command: 'padpo -i $CHANGED_PO_FILES 2>&1 | grep -v -Ff padpo.ignore' name: ${{ matrix.tool.name }} (${{ matrix.tool.package }}) runs-on: ubuntu-latest @@ -52,8 +51,13 @@ jobs: MODIFIED_FILES: ${{ join(fromJSON(steps.changed_files.outputs.modified), ' ') }} run: | CHANGED_PO_FILES=$(printf "%s %s\n" "$ADDED_FILES" "$MODIFIED_FILES" | tr ' ' '\n' | grep '.po$') - echo "Running on:" $CHANGED_PO_FILES - [ -n "$CHANGED_PO_FILES" ] && ${{ matrix.tool.command }} $CHANGED_PO_FILES ${{ matrix.tool.command_suffix }} + if [ -n "$CHANGED_PO_FILES" ] + then + echo "Running on:" $CHANGED_PO_FILES + ${{ matrix.tool.command }} + else + echo "No changed po files, nothing to check." + fi sphinx: name: 'Génération de la doc (sphinx)' From 0f66f01707ef440a3d417930fb2a6388f5201d63 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Thu, 17 Dec 2020 14:41:39 +0100 Subject: [PATCH 3/5] This line should not fail if there's no po files. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4b6c61a7f..49cde0044 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,7 +50,7 @@ jobs: ADDED_FILES: ${{ join(fromJSON(steps.changed_files.outputs.added), ' ') }} MODIFIED_FILES: ${{ join(fromJSON(steps.changed_files.outputs.modified), ' ') }} run: | - CHANGED_PO_FILES=$(printf "%s %s\n" "$ADDED_FILES" "$MODIFIED_FILES" | tr ' ' '\n' | grep '.po$') + CHANGED_PO_FILES=$(printf "%s %s\n" "$ADDED_FILES" "$MODIFIED_FILES" | tr ' ' '\n' | grep '.po$') ;: if [ -n "$CHANGED_PO_FILES" ] then echo "Running on:" $CHANGED_PO_FILES From d153549fb4754456f3423f0ac6c0a8a3945312f2 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Thu, 17 Dec 2020 14:43:15 +0100 Subject: [PATCH 4/5] Please, Github, do not stop at this line. Seriously. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 49cde0044..025b77522 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,7 +50,7 @@ jobs: ADDED_FILES: ${{ join(fromJSON(steps.changed_files.outputs.added), ' ') }} MODIFIED_FILES: ${{ join(fromJSON(steps.changed_files.outputs.modified), ' ') }} run: | - CHANGED_PO_FILES=$(printf "%s %s\n" "$ADDED_FILES" "$MODIFIED_FILES" | tr ' ' '\n' | grep '.po$') ;: + CHANGED_PO_FILES=$(printf "%s %s\n" "$ADDED_FILES" "$MODIFIED_FILES" | tr ' ' '\n' | grep '.po$' | cat) if [ -n "$CHANGED_PO_FILES" ] then echo "Running on:" $CHANGED_PO_FILES From 83831d9af11d0b97b5b68466cd19909790d9e2d3 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Thu, 17 Dec 2020 14:46:46 +0100 Subject: [PATCH 5/5] Probably more meaningfull like this. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 025b77522..9b87b1aa2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,7 +50,7 @@ jobs: ADDED_FILES: ${{ join(fromJSON(steps.changed_files.outputs.added), ' ') }} MODIFIED_FILES: ${{ join(fromJSON(steps.changed_files.outputs.modified), ' ') }} run: | - CHANGED_PO_FILES=$(printf "%s %s\n" "$ADDED_FILES" "$MODIFIED_FILES" | tr ' ' '\n' | grep '.po$' | cat) + CHANGED_PO_FILES=$(printf "%s %s\n" "$ADDED_FILES" "$MODIFIED_FILES" | tr ' ' '\n' | grep '.po$'; true) if [ -n "$CHANGED_PO_FILES" ] then echo "Running on:" $CHANGED_PO_FILES