diff --git a/.github/workflows/hosted_runners.yml b/.github/workflows/hosted_runners.yml index 7328f2fd84b..f2cc290d7df 100644 --- a/.github/workflows/hosted_runners.yml +++ b/.github/workflows/hosted_runners.yml @@ -23,6 +23,7 @@ on: branches: - 'master' - 'main' + - 'stefano/ci/update-windows-build-tools' tags: - '*' @@ -136,6 +137,7 @@ jobs: # This job runs source code analysis tools (currently, just cppcheck) check_source_code: + if: false needs: [check_code_style, check_libraries_manifest] runs-on: ${{ matrix.os }} @@ -251,6 +253,7 @@ jobs: # The Linux build will only start once we know that the code # has been properly formatted build_linux: + if: false needs: [check_code_style, check_libraries_manifest] runs-on: ${{ matrix.os }} @@ -529,6 +532,7 @@ jobs: # The macOS build will only start once we know that the code # has been properly formatted build_macos: + if: false needs: [check_code_style, check_libraries_manifest] runs-on: ${{ matrix.os }} @@ -1132,25 +1136,27 @@ jobs: # TODO: Implement a cache so we don't keep hitting the server at each run - name: Install sccache + id: sccache_install working-directory: ${{ steps.build_paths.outputs.DOWNLOADS }} shell: powershell run: | - $long_version = "0.0.1" + $long_version = "0.8.2" - $archive_name = $("sccache-" + $long_version + "-windows.7z") - $url = $("https://github.com/osquery/sccache/releases/download/" + $long_version + "-osquery/" + $archive_name) + $archive_name = $("sccache-v" + $long_version + "x86_64-pc-windows-msvc.zip") + $url = $("https://github.com/mozilla/sccache/releases/download/v" + $long_version + "/" + $archive_name) (New-Object System.Net.WebClient).DownloadFile($url, $archive_name) 7z x -o${{ steps.build_paths.outputs.INSTALL }}\sccache -y $archive_name echo "${{ steps.build_paths.outputs.INSTALL }}\sccache" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + echo "SCCACHE_VERSION=$long_version" >> $env:GITHUB_OUTPUT # TODO: Implement a cache so we don't keep hitting the server at each run - name: Install Ninja working-directory: ${{ steps.build_paths.outputs.DOWNLOADS }} shell: powershell run: | - $long_version = "1.10.0" + $long_version = "1.12.1" $archive_name = "ninja-win.zip" $url = $("https://github.com/ninja-build/ninja/releases/download/v" + $long_version + "/" + $archive_name) @@ -1233,10 +1239,10 @@ jobs: path: ${{ steps.build_paths.outputs.SCCACHE }} key: | - sccache_${{ matrix.os }}_${{ matrix.bitness }}_${{ matrix.build_type }}_${{ steps.determine_compiler_version.outputs.COMPILER_VERSION }}_${{ github.sha }} + sccache_${{ steps.sccache_install.outputs.SCCACHE_VERSION }}_${{ matrix.os }}_${{ matrix.bitness }}_${{ matrix.build_type }}_${{ steps.determine_compiler_version.outputs.COMPILER_VERSION }}_${{ github.sha }} restore-keys: | - sccache_${{ matrix.os }}_${{ matrix.bitness }}_${{ matrix.build_type }}_${{ steps.determine_compiler_version.outputs.COMPILER_VERSION }} + sccache_${{ steps.sccache_install.outputs.SCCACHE_VERSION }}_${{ matrix.os }}_${{ matrix.bitness }}_${{ matrix.build_type }}_${{ steps.determine_compiler_version.outputs.COMPILER_VERSION }} - name: Build the project shell: cmd