From e69eeb734475b47ddfe03f6d3815fc0f83eeb3f0 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 25 Sep 2023 21:53:03 -0700 Subject: [PATCH] move remaining big files into LFS (#30053) old-commit-hash: e185e5ffcd165ee35e1bbd8c80631a89247a1dfc --- .gitattributes | 16 ++++++++-------- .github/workflows/selfdrive_tests.yaml | 8 +++++--- .github/workflows/setup-with-retry/action.yaml | 7 ------- .github/workflows/setup/action.yaml | 5 ----- .github/workflows/tools_tests.yaml | 4 ---- 5 files changed, 13 insertions(+), 27 deletions(-) diff --git a/.gitattributes b/.gitattributes index b99914dbb0..1aef6c432d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,26 +1,26 @@ *.dlc filter=lfs diff=lfs merge=lfs -text *.onnx filter=lfs diff=lfs merge=lfs -text selfdrive/car/tests/test_models_segs.txt filter=lfs diff=lfs merge=lfs -text - selfdrive/assets/fonts/*.ttf filter=lfs diff=lfs merge=lfs -text selfdrive/assets/training/*.png filter=lfs diff=lfs merge=lfs -text -*.ico filter=lfs diff=lfs merge=lfs -text -*.svg filter=lfs diff=lfs merge=lfs -text -*.png filter=lfs diff=lfs merge=lfs -text -*.gif filter=lfs diff=lfs merge=lfs -text -*.ttf filter=lfs diff=lfs merge=lfs -text -*.wav filter=lfs diff=lfs merge=lfs -text system/hardware/tici/updater filter=lfs diff=lfs merge=lfs -text selfdrive/ui/qt/spinner_larch64 filter=lfs diff=lfs merge=lfs -text selfdrive/ui/qt/text_larch64 filter=lfs diff=lfs merge=lfs -text third_party/**/*.a filter=lfs diff=lfs merge=lfs -text third_party/**/*.so filter=lfs diff=lfs merge=lfs -text -third_party/**/*.so.* filter=lfs diff=lfs merge=lfs -text third_party/**/*.dylib filter=lfs diff=lfs merge=lfs -text third_party/acados/*/t_renderer filter=lfs diff=lfs merge=lfs -text +third_party/bootstrap/bootstrap-icons.svg filter=lfs diff=lfs merge=lfs -text third_party/qt5/larch64/bin/lrelease filter=lfs diff=lfs merge=lfs -text third_party/qt5/larch64/bin/lupdate filter=lfs diff=lfs merge=lfs -text third_party/catch2/include/catch2/catch.hpp filter=lfs diff=lfs merge=lfs -text +*.ico filter=lfs diff=lfs merge=lfs -text +*.svg filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.gif filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.wav filter=lfs diff=lfs merge=lfs -text +third_party/**/*.so.* filter=lfs diff=lfs merge=lfs -text *.apk filter=lfs diff=lfs merge=lfs -text *.apkpatch filter=lfs diff=lfs merge=lfs -text *.jar filter=lfs diff=lfs merge=lfs -text diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index ee7a8af833..fc9868b929 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -38,6 +38,7 @@ jobs: - uses: actions/checkout@v3 with: submodules: true + - run: git lfs pull - name: Build devel timeout-minutes: 1 run: TARGET_DIR=$STRIPPED_DIR release/build_devel.sh @@ -95,6 +96,7 @@ jobs: - uses: actions/checkout@v3 with: submodules: true + - run: git lfs pull - name: Determine pre-existing Homebrew packages if: steps.dependency-cache.outputs.cache-hit != 'true' run: | @@ -198,7 +200,6 @@ jobs: $DOCKER_LOGIN - uses: ./.github/workflows/setup-with-retry with: - git_lfs: false docker_hub_pat: ${{ secrets.DOCKER_HUB_PAT }} - name: Build and push CL Docker image if: matrix.arch == 'x86_64' @@ -230,8 +231,7 @@ jobs: - uses: actions/checkout@v3 with: submodules: true - - name: Build Docker image - run: eval "$BUILD" + - uses: ./.github/workflows/setup-with-retry - name: pre-commit timeout-minutes: 4 run: ${{ env.RUN }} "unset PYTHONWARNINGS && pre-commit run --all" @@ -394,6 +394,7 @@ jobs: with: submodules: true ref: ${{ github.event.pull_request.base.ref }} + - run: git lfs pull - uses: ./.github/workflows/setup-with-retry - name: Get base car info run: | @@ -403,6 +404,7 @@ jobs: with: submodules: true path: current + - run: cd current && git lfs pull - name: Save car docs diff id: save_diff run: | diff --git a/.github/workflows/setup-with-retry/action.yaml b/.github/workflows/setup-with-retry/action.yaml index 159778211d..e0da746b44 100644 --- a/.github/workflows/setup-with-retry/action.yaml +++ b/.github/workflows/setup-with-retry/action.yaml @@ -5,10 +5,6 @@ inputs: description: 'Auth token for Docker Hub, required for BuildJet jobs' required: false default: '' - git_lfs: - description: 'Whether or not to pull the git lfs' - required: false - default: 'true' cache_key_prefix: description: 'Prefix for caching key' required: false @@ -26,7 +22,6 @@ runs: continue-on-error: true with: docker_hub_pat: ${{ inputs.docker_hub_pat }} - git_lfs: ${{ inputs.git_lfs }} cache_key_prefix: ${{ inputs.cache_key_prefix }} is_retried: true - if: steps.setup1.outcome == 'failure' @@ -38,7 +33,6 @@ runs: continue-on-error: true with: docker_hub_pat: ${{ inputs.docker_hub_pat }} - git_lfs: ${{ inputs.git_lfs }} cache_key_prefix: ${{ inputs.cache_key_prefix }} is_retried: true - if: steps.setup2.outcome == 'failure' @@ -49,6 +43,5 @@ runs: uses: ./.github/workflows/setup with: docker_hub_pat: ${{ inputs.docker_hub_pat }} - git_lfs: ${{ inputs.git_lfs }} cache_key_prefix: ${{ inputs.cache_key_prefix }} is_retried: true diff --git a/.github/workflows/setup/action.yaml b/.github/workflows/setup/action.yaml index d00f968b5c..8bb1ccc376 100644 --- a/.github/workflows/setup/action.yaml +++ b/.github/workflows/setup/action.yaml @@ -5,10 +5,6 @@ inputs: description: 'Auth token for Docker Hub, required for BuildJet jobs' required: true default: '' - git_lfs: - description: 'Whether or not to pull the git lfs' - required: true - default: 'true' cache_key_prefix: description: 'Prefix for caching key' required: true @@ -30,7 +26,6 @@ runs: # do this after checkout to ensure our custom LFS config is used to pull from GitLab - shell: bash - if: ${{ inputs.git_lfs == 'true' }} run: git lfs pull # on BuildJet runners, must be logged into DockerHub to avoid rate limiting diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml index 1dea47f638..73d43e24b2 100644 --- a/.github/workflows/tools_tests.yaml +++ b/.github/workflows/tools_tests.yaml @@ -72,8 +72,6 @@ jobs: with: submodules: true - uses: ./.github/workflows/setup-with-retry - with: - git_lfs: false - name: Setup to push to repo if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot' run: | @@ -91,8 +89,6 @@ jobs: with: submodules: true - uses: ./.github/workflows/setup-with-retry - with: - git_lfs: false - name: Use local image for testing devcontainer with latest base image run: | echo "USE_LOCAL_IMAGE=true" >> "$GITHUB_ENV"