From daa9e852c9bb4d5fee99e4e4b28f14df36f57c86 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Wed, 15 May 2024 12:38:49 -0400 Subject: [PATCH] Toolchain+CI: Remove unused TRY_USE_LOCAL_TOOLCHAIN parameter This was used to create a .tar of the built Clang toolchain, but now we just upload the built toolchain artifacts (same as the GNU toolchain). --- .github/workflows/serenity-template.yml | 1 - Toolchain/BuildClang.sh | 54 ------------------------- 2 files changed, 55 deletions(-) diff --git a/.github/workflows/serenity-template.yml b/.github/workflows/serenity-template.yml index f9167e7f746..b182a8dfd40 100644 --- a/.github/workflows/serenity-template.yml +++ b/.github/workflows/serenity-template.yml @@ -83,7 +83,6 @@ jobs: env: ARCH: ${{ inputs.arch}} CCACHE_DIR: ${{ env.TOOLCHAIN_CCACHE_DIR }} - TRY_USE_LOCAL_TOOLCHAIN: 'y' - name: Build AArch64 Qemu if: ${{ inputs.arch == 'aarch64' && !steps.cache-restore.outputs.qemu_cache_hit }} diff --git a/Toolchain/BuildClang.sh b/Toolchain/BuildClang.sh index 45ccfca9cd8..5e6b17aff9f 100755 --- a/Toolchain/BuildClang.sh +++ b/Toolchain/BuildClang.sh @@ -159,43 +159,6 @@ else buildstep setup echo "Using user-provided CFLAGS/CXXFLAGS." fi -# === CHECK CACHE AND REUSE === - -pushd "$DIR" - if [ "$TRY_USE_LOCAL_TOOLCHAIN" = "y" ]; then - mkdir -p Cache - echo "Cache (before):" - ls -l Cache - CACHED_TOOLCHAIN_ARCHIVE="Cache/ToolchainBinariesGithubActions.tar.gz" - if [ -r "${CACHED_TOOLCHAIN_ARCHIVE}" ] ; then - echo "Cache at ${CACHED_TOOLCHAIN_ARCHIVE} exists!" - echo "Extracting toolchain from cache:" - if tar xzf "${CACHED_TOOLCHAIN_ARCHIVE}" ; then - echo "Done 'building' the toolchain." - echo "Cache unchanged." - exit 0 - else - echo - echo - echo - echo "Could not extract cached toolchain archive." - echo "This means the cache is broken and *should be removed*!" - echo "As Github Actions cannot update a cache, this will unnecessarily" - echo "slow down all future builds for this hash, until someone" - echo "resets the cache." - echo - echo - echo - rm -f "${CACHED_TOOLCHAIN_ARCHIVE}" - fi - else - echo "Cache at ${CACHED_TOOLCHAIN_ARCHIVE} does not exist." - echo "Will rebuild toolchain from scratch, and save the result." - fi - fi - echo "::group::Actually building Toolchain" -popd - # === DOWNLOAD AND PATCH === pushd "$DIR/Tarballs" @@ -310,20 +273,3 @@ pushd "$DIR/Local/clang/bin/" echo "--sysroot=$BUILD/${arch}clang/Root" > "$arch"-pc-serenity.cfg done popd - -# === SAVE TO CACHE === - -pushd "$DIR" - if [ "$TRY_USE_LOCAL_TOOLCHAIN" = "y" ]; then - echo "::endgroup::" - echo "Building cache tar:" - - echo "Building cache tar:" - - rm -f "${CACHED_TOOLCHAIN_ARCHIVE}" # Just in case - - tar czf "${CACHED_TOOLCHAIN_ARCHIVE}" Local/ - echo "Cache (after):" - ls -l Cache - fi -popd