From e3bf62e64d89e846c0c71a3e5d48be2fef639c89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Fam=C3=A0?= Date: Thu, 19 Oct 2023 14:32:38 +0200 Subject: [PATCH] Disable CI cache Due to PostActions not executing we'll disable the SCons cache for now. --- .github/workflows/build_all.yml | 20 ++++++++++---------- addons/Wwise/native/SConstruct | 6 ------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 1ec2d3e4..6aef7ee0 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -74,16 +74,16 @@ jobs: path: addons/Wwise/native/wwise_sdk key: ${{ matrix.sdk-platform }}-build-${{ env.cache-name }}-${{ env.WWISE_VERSION }} - - name: Load .scons_cache directory - id: cache-godot-extension - uses: actions/cache@v3 - with: - path: ${{github.workspace}}/.scons_cache/ - key: ${{matrix.sdk-platform}}-${{env.BASE_BRANCH}}-${{github.ref}}-${{github.sha}} - restore-keys: | - ${{matrix.sdk-platform}}-${{env.BASE_BRANCH}}-${{github.ref}}-${{github.sha}} - ${{matrix.sdk-platform}}-${{env.BASE_BRANCH}}-${{github.ref}} - ${{matrix.sdk-platform}}-${{env.BASE_BRANCH}} + # - name: Load .scons_cache directory + # id: cache-godot-extension + # uses: actions/cache@v3 + # with: + # path: ${{github.workspace}}/.scons_cache/ + # key: ${{matrix.sdk-platform}}-${{env.BASE_BRANCH}}-${{github.ref}}-${{github.sha}} + # restore-keys: | + # ${{matrix.sdk-platform}}-${{env.BASE_BRANCH}}-${{github.ref}}-${{github.sha}} + # ${{matrix.sdk-platform}}-${{env.BASE_BRANCH}}-${{github.ref}} + # ${{matrix.sdk-platform}}-${{env.BASE_BRANCH}} - name: Set up Python 3.x uses: actions/setup-python@v4 diff --git a/addons/Wwise/native/SConstruct b/addons/Wwise/native/SConstruct index 2a99edc1..cd16c398 100644 --- a/addons/Wwise/native/SConstruct +++ b/addons/Wwise/native/SConstruct @@ -12,15 +12,9 @@ else: def decode_utf8(x): return codecs.utf_8_decode(x)[0] - env = SConscript("godot-cpp/SConstruct") opts = Variables([], ARGUMENTS) -scons_cache_path = os.environ.get("SCONS_CACHE") -if scons_cache_path != None: - CacheDir(scons_cache_path) - print("SCons cache enabled... (path: '" + scons_cache_path + "')") - # Define our options opts.Add( PathVariable(