Revert Qt MOC hacks (#29528)

* Revert "CI: prevent moc from running in cache population step (#29401)"

This reverts commit d1aedccfbe.

* Revert "SCons: respect cache read only (#29437)"

This reverts commit 59abb469ea.

* don't change moc path
This commit is contained in:
Adeeb Shihadeh
2023-08-22 11:16:58 -07:00
committed by GitHub
parent d1aedccfbe
commit 91dc8457ae
5 changed files with 5 additions and 35 deletions

View File

@@ -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