mirror of
https://github.com/dragonpilot/dragonpilot.git
synced 2026-02-28 19:23:52 +08:00
Revert Qt MOC hacks (#29528)
* Revert "CI: prevent moc from running in cache population step (#29401)" This reverts commitd1aedccfbe. * Revert "SCons: respect cache read only (#29437)" This reverts commit59abb469ea. * don't change moc path
This commit is contained in:
8
.github/workflows/selfdrive_tests.yaml
vendored
8
.github/workflows/selfdrive_tests.yaml
vendored
@@ -82,8 +82,9 @@ jobs:
|
||||
run: ${{ env.RUN }} "scons -j$(nproc) --extras && release/check-dirty.sh"
|
||||
- name: Cleanup scons cache and rebuild
|
||||
timeout-minutes: ${{ ((steps.restore-scons-cache.outputs.cache-hit == 'true') && 2 || 30) }} # allow more time when we missed the scons cache
|
||||
if: github.ref == 'refs/heads/master'
|
||||
run: ${{ env.RUN }} "release/clean-cache.sh"
|
||||
run: |
|
||||
${{ env.RUN }} "rm -rf /tmp/scons_cache/* && \
|
||||
scons -j$(nproc) --cache-populate"
|
||||
- name: Save scons cache
|
||||
uses: actions/cache/save@v3
|
||||
if: github.ref == 'refs/heads/master'
|
||||
@@ -158,8 +159,9 @@ jobs:
|
||||
- name: Pre Cache - Cleanup scons cache
|
||||
if: github.ref == 'refs/heads/master'
|
||||
run: |
|
||||
rm -rf /tmp/scons_cache/*
|
||||
eval "$(pyenv init --path)"
|
||||
poetry run release/clean-cache.sh
|
||||
poetry run scons -j$(nproc) --cache-populate
|
||||
- name: Save scons cache
|
||||
id: scons-save-cache
|
||||
uses: actions/cache/save@v3
|
||||
|
||||
Reference in New Issue
Block a user