Pārlūkot izejas kodu

Disable hash_dir, ccache cleanup, enable timeout, and re-enable TrackFileAccess (#19090)

* Disable hash_dir, ccache cleanup, enable timeout, and re-enable TrackFileAccess

Signed-off-by: Mike Chang <[email protected]>
Mike Chang 3 nedēļas atpakaļ
vecāks
revīzija
917547178c

+ 3 - 0
.github/workflows/android-build.yml

@@ -103,6 +103,7 @@ jobs:
           ccache_options: |
             max_size=10G
             inode_cache=true
+            hash_dir=false
             temporary_dir=${{ env.DEV_DRIVE }}\temp
             cache_dir=${{ env.DEV_DRIVE_WORKSPACE }}\.ccache
       
@@ -150,6 +151,7 @@ jobs:
           if (Test-Path ${{ env.DEV_DRIVE_WORKSPACE }}\cache.tar) {          
             tar -xvpf ${{ env.DEV_DRIVE_WORKSPACE }}\cache.tar
             rm ${{ env.DEV_DRIVE_WORKSPACE }}\cache.tar
+            ${{ env.O3DE_COMPILER_CACHE_PATH }} --zero-stats --cleanup
           }
       
       - name: Setup cmake
@@ -182,6 +184,7 @@ jobs:
         # Builds with presets in ../scripts/build/Platform/Android/build_config.json
         # Set temp folders to the workspace drive as the boot drive is slow
         working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
+        timeout-minutes: 310
         run: |
           $env:LY_3RDPARTY_PATH = "${{ env.DEV_DRIVE_WORKSPACE }}\3rdParty"
           $env:TEMP = "${{ env.DEV_DRIVE }}\temp" 

+ 2 - 1
.github/workflows/linux-build.yml

@@ -85,6 +85,7 @@ jobs:
           restore_cache: false
           ccache_options: |
             max_size=10G
+            hash_dir=false
             cache_dir=${{ github.workspace }}/.ccache
 
       - name: Get last run
@@ -129,6 +130,7 @@ jobs:
           if [ -f ${{ github.workspace }}/cache.tar ]; then          
             tar -xvpf ${{ github.workspace }}/cache.tar --ignore-failed-read
             rm ${{ github.workspace }}/cache.tar
+            ccache --zero-stats --cleanup
           fi
 
       - name: Setup cmake
@@ -161,7 +163,6 @@ jobs:
           
       - name: Build ${{ inputs.type }}
         # Builds with presets in ../scripts/build/Platform/Linux/build_config.json
-        working-directory: "${{ env.DEV_DRIVE_WORKSPACE }}"
         run: |
           export LY_3RDPARTY_PATH=${{ github.workspace }}/3rdParty
           export CC=${{ inputs.compiler == 'gcc' && 'gcc' || 'clang'   }}

+ 5 - 2
.github/workflows/windows-build.yml

@@ -59,8 +59,8 @@ jobs:
       - name: Git LFS pull
         # Minimal pull for profile builds, otherwise pull all
         run: |
-            git lfs install
-            if ("${{ inputs.type }}" -eq "profile") { git lfs pull --include "*.ico,*.bmp" } else { git lfs pull }
+          git lfs install
+          if ("${{ inputs.type }}" -eq "profile") { git lfs pull --include "*.ico,*.bmp" } else { git lfs pull }
 
       - name: Setup DevDrive
         uses: samypr100/setup-dev-drive@b9079d2711b01ed39de859c79c96484bfd80e078 # v3.4.1
@@ -102,6 +102,7 @@ jobs:
           ccache_options: |
             max_size=10G
             inode_cache=true
+            hash_dir=false
             temporary_dir=${{ env.DEV_DRIVE }}\temp
             cache_dir=${{ env.DEV_DRIVE_WORKSPACE }}\.ccache
       
@@ -149,6 +150,7 @@ jobs:
           if (Test-Path ${{ env.DEV_DRIVE_WORKSPACE }}\cache.tar) {          
             tar -xvpf ${{ env.DEV_DRIVE_WORKSPACE }}\cache.tar
             rm ${{ env.DEV_DRIVE_WORKSPACE }}\cache.tar
+            ${{ env.O3DE_COMPILER_CACHE_PATH }} --zero-stats --cleanup
           }
       
       - name: Setup cmake
@@ -174,6 +176,7 @@ jobs:
         # Builds with presets in ../scripts/build/Platform/Windows/build_config.json
         # Set temp folders to the workspace drive as the boot drive is slow
         working-directory: "${{ env.DEV_DRIVE_WORKSPACE }}"
+        timeout-minutes: 310
         run: |
           $env:LY_3RDPARTY_PATH = "${{ env.DEV_DRIVE_WORKSPACE }}\3rdParty"
           $env:TEMP = "${{ env.DEV_DRIVE }}\temp"

+ 0 - 1
cmake/Platform/Common/MSVC/Configurations_msvc.cmake

@@ -147,7 +147,6 @@ if((O3DE_ENABLE_COMPILER_CACHE OR "$ENV{O3DE_ENABLE_COMPILER_CACHE}" STREQUAL "t
     set(CMAKE_VS_GLOBALS
         "CLToolExe=cl.exe"
         "CLToolPath=${CMAKE_BINARY_DIR}"
-        "TrackFileAccess=false"
     )
 else()
     ly_append_configurations_options(