Commit 50fc909
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -35,7 +35,7 @@ jobs: | |||
| 35 | 35 | - run: git pull | |
| 36 | 36 | working-directory: ./Doc/locales/de/LC_MESSAGES | |
| 37 | 37 | - uses: sphinx-doc/github-problem-matcher@v1.1 | |
| 38 | - - run: make -e SPHINXOPTS="--color -D language='de' -D suppress_warnings=i18n.inconsistent_references -W --keep-going" ${{ matrix.format }} | ||
| 38 | + - run: make -e SPHINXOPTS="--color -D language='de' -W --keep-going" ${{ matrix.format }} | ||
| 39 | 39 | working-directory: ./Doc | |
| 40 | 40 | - uses: actions/upload-artifact@master | |
| 41 | 41 | if: success() || failure() | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2,6 +2,9 @@ | |||
| 2 | 2 | *.po~ | |
| 3 | 3 | .DS_Store | |
| 4 | 4 | ||
| 5 | + # IDE | ||
| 6 | + .idea/ | ||
| 7 | + | ||
| 5 | 8 | # Python | |
| 6 | 9 | __pycache__/ | |
| 7 | 10 | *.py[cod] | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -78,7 +78,25 @@ if ! $NONINTERACTIVE; then | |||
| 78 | 78 | fi | |
| 79 | 79 | ||
| 80 | 80 | if $RUN_QUICK; then | |
| 81 | - log_section "1a/4 msgfmt --check (Syntax)" | ||
| 81 | + log_section "1a/5 powrap (Zeilenumbruch auf 80 Zeichen)" | ||
| 82 | + if ! command -v powrap &>/dev/null; then | ||
| 83 | + echo "powrap nicht gefunden -- installiere mit: pip install powrap" | ||
| 84 | + else | ||
| 85 | + # Die CI formatiert nach jedem Push automatisch mit powrap und | ||
| 86 | + # committet das Ergebnis. Wer lokal nicht formatiert, bekommt beim | ||
| 87 | + # naechsten Rebase Konflikte in genau diesen Zeilen. Deshalb hier. | ||
| 88 | + vorher=$(git -C "$REPO_ROOT" diff --name-only -- '*.po' | wc -l | tr -d ' ') | ||
| 89 | + powrap -m 2>/dev/null | ||
| 90 | + nachher=$(git -C "$REPO_ROOT" diff --name-only -- '*.po' | wc -l | tr -d ' ') | ||
| 91 | + if [[ "$vorher" != "$nachher" ]]; then | ||
| 92 | + echo "powrap hat weitere Dateien umbrochen -- bitte mit committen." | ||
| 93 | + else | ||
| 94 | + echo "OK -- Umbruch war bereits sauber." | ||
| 95 | + fi | ||
| 96 | + pass=$((pass + 1)) | ||
| 97 | + fi | ||
| 98 | + | ||
| 99 | + log_section "1b/5 msgfmt --check (Syntax)" | ||
| 82 | 100 | msgfmt_errors=0 | |
| 83 | 101 | while IFS= read -r -d '' po; do | |
| 84 | 102 | rel="${po#"$REPO_ROOT"/}" | |
@@ -97,7 +115,7 @@ if $RUN_QUICK; then | |||
| 97 | 115 | fail=$((fail + 1)) | |
| 98 | 116 | fi | |
| 99 | 117 | ||
| 100 | - log_section "1b/4 sphinx-lint (Backtick-/Rollen-Syntax)" | ||
| 118 | + log_section "1c/5 sphinx-lint (Backtick-/Rollen-Syntax)" | ||
| 101 | 119 | if ! command -v sphinx-lint &>/dev/null; then | |
| 102 | 120 | echo "sphinx-lint nicht gefunden -- installiere mit: pip install sphinx-lint" | |
| 103 | 121 | fail=$((fail + 1)) | |
@@ -118,7 +136,7 @@ if $RUN_QUICK; then | |||
| 118 | 136 | fi | |
| 119 | 137 | fi | |
| 120 | 138 | ||
| 121 | - log_section "1c/4 Rollen-Konsistenz (eigener Check, kein Build noetig)" | ||
| 139 | + log_section "1d/5 Rollen-Konsistenz (eigener Check, kein Build noetig)" | ||
| 122 | 140 | if [[ ! -f "$CHECK_ROLES_PY" ]]; then | |
| 123 | 141 | echo "check_roles.py nicht gefunden unter $CHECK_ROLES_PY -- Schritt uebersprungen." | |
| 124 | 142 | else | |
@@ -129,7 +147,7 @@ if $RUN_QUICK; then | |||
| 129 | 147 | fi | |
| 130 | 148 | fi | |
| 131 | 149 | ||
| 132 | - log_section "1d/4 Auszeichnung (ueberfluessige Backticks, Codebloecke, Literale)" | ||
| 150 | + log_section "1e/5 Auszeichnung (ueberfluessige Backticks, Codebloecke, Literale)" | ||
| 133 | 151 | if [[ ! -f "$CHECK_MARKUP_PY" ]]; then | |
| 134 | 152 | echo "check_markup.py nicht gefunden unter $CHECK_MARKUP_PY -- Schritt uebersprungen." | |
| 135 | 153 | else | |
0 commit comments