From ccc964565eda851658fd36a4b88ad45d9903dfff Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Tue, 6 Aug 2024 20:57:18 -0700 Subject: [PATCH] better --- .github/workflows/selfdrive_tests.yaml | 13 ++----------- scripts/lint.sh | 11 ++++++++++- selfdrive/ui/ui.py | 1 + 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index 73f80884232189..b0dbfbebeec976 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -61,29 +61,20 @@ jobs: cd $STRIPPED_DIR ${{ env.RUN }} "release/check-dirty.sh && \ MAX_EXAMPLES=5 $PYTEST -m 'not slow' selfdrive/car" - - name: Getting modified files timeout-minutes: 1 run: | cd $GITHUB_WORKSPACE git fetch --unshallow --recurse-submodules=no origin master:master ALL_FILES=$(git diff --name-only --cached --diff-filter=AM $(git merge-base HEAD master)) - cd $STRIPPED_DIR - VALID_FILES="" - for f in $ALL_FILES; do - if [[ -f "$f" ]]; then - VALID_FILES+="$f " - fi - done - echo FILES=$(echo $VALID_FILES) >> $GITHUB_ENV - + echo FILES=$(echo $ALL_FILES) >> $GITHUB_ENV - name: Static analysis timeout-minutes: 1 run: | cd $GITHUB_WORKSPACE cp pyproject.toml $STRIPPED_DIR cd $STRIPPED_DIR - ${{ env.RUN }} "scripts/lint.sh '$(echo $FILES | tr " " "\n")'" + ${{ env.RUN }} "scripts/lint.sh $FILES" build: strategy: diff --git a/scripts/lint.sh b/scripts/lint.sh index 7682bbddf4d35e..305a405cf5604b 100755 --- a/scripts/lint.sh +++ b/scripts/lint.sh @@ -39,6 +39,9 @@ function run_tests() { ALL_FILES=$(echo "$@" | sed -E "s/$IGNORED_FILES//g") PYTHON_FILES=$(echo "$ALL_FILES" | grep --color=never '.py$' || true) + echo $ALL_FILES + echo $PYTHON_FILES + if [[ -n "$PYTHON_FILES" ]]; then run "ruff" ruff check $PYTHON_FILES --quiet run "mypy" mypy $PYTHON_FILES @@ -55,7 +58,13 @@ function run_tests() { } if [[ -n $@ ]]; then - run_tests "$@" + VALID_FILES="" + for f in $@; do + if [[ -f "$f" ]]; then + VALID_FILES+="$f " + fi + done + run_tests "$(echo $VALID_FILES | tr " " "\n")" else run_tests "$(git diff --name-only --cached --diff-filter=AM $(git merge-base HEAD master))" fi diff --git a/selfdrive/ui/ui.py b/selfdrive/ui/ui.py index 660495b1dec85c..627cc2842723e0 100755 --- a/selfdrive/ui/ui.py +++ b/selfdrive/ui/ui.py @@ -10,6 +10,7 @@ from PyQt5.QtCore import Qt, QTimer from PyQt5.QtWidgets import QLabel, QWidget, QVBoxLayout, QStackedLayout, QApplication from openpilot.selfdrive.ui.qt.python_helpers import set_main_window +#aaaaa if __name__ == "__main__":