Revert "ci: cache stage0 cabal binary across CI runs"

This reverts commit 8d1e382.

Author: angerman

.github/workflows/ci.yml

@@ -7,9 +7,6 @@ on:
     branches: [stable-ghc-9.14, stable-master]
   workflow_dispatch:
 
-env:
-  CABAL_CACHE_PATH: _build/cabal/bin
-
 jobs:
   cabal:
     strategy:
@@ -56,12 +53,6 @@ jobs:
         minimal: true
         ghc: true
 
-    - name: Cache stage0 cabal binary
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.CABAL_CACHE_PATH }}
-        key: cabal-v1-${{ matrix.plat }}-${{ hashFiles('cabal.project.stage0') }}
-
     - name: Update hackage
       shell: devx {0}
       run: cabal update

.github/workflows/reusable-release.yml

@@ -44,8 +44,6 @@ env:
   CHERE_INVOKING: 1
   # dynamic
   DYNAMIC: ${{ inputs.dynamic }}
-  # stage0 cabal cache
-  CABAL_CACHE_PATH: _build/cabal/bin
 
 jobs:
   tool-output:
@@ -151,12 +149,6 @@ jobs:
           ./emsdk install ${{ env.EMSDK_VERSION }}
           ./emsdk activate ${{ env.EMSDK_VERSION }}
 
-      - name: Cache stage0 cabal binary
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.CABAL_CACHE_PATH }}
-          key: cabal-v1-${{ matrix.platform.ARTIFACT }}-${{ hashFiles('cabal.project.stage0') }}
-
       - name: Run build
         run: &build |
           set -eux
@@ -222,12 +214,6 @@ jobs:
           ref: ${{ matrix.branch }}
           submodules: recursive
 
-      - name: Cache stage0 cabal binary
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.CABAL_CACHE_PATH }}
-          key: cabal-v1-${{ matrix.platform.ARTIFACT }}-${{ hashFiles('cabal.project.stage0') }}
-
       # debian 11 ships with make 4.3, but we need 4.4
       - if: matrix.platform.ARTIFACT == 'aarch64-linux-deb11'
         uses: docker://arm64v8/debian:11
@@ -318,12 +304,6 @@ jobs:
           echo "/usr/local/opt/make/libexec/gnubin" >> $GITHUB_PATH
           echo "/usr/local/opt/libtool/libexec/gnubin" >> $GITHUB_PATH
 
-      - name: Cache stage0 cabal binary
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.CABAL_CACHE_PATH }}
-          key: cabal-v1-${{ env.ARTIFACT }}-${{ hashFiles('cabal.project.stage0') }}
-
       - name: Install emscripten
         run : *emscripten
 
@@ -373,12 +353,6 @@ jobs:
           echo "/opt/homebrew/opt/make/libexec/gnubin" >> $GITHUB_PATH
           echo "/opt/homebrew/opt/libtool/libexec/gnubin" >> $GITHUB_PATH
 
-      - name: Cache stage0 cabal binary
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.CABAL_CACHE_PATH }}
-          key: cabal-v1-${{ env.ARTIFACT }}-${{ hashFiles('cabal.project.stage0') }}
-
       - name: Run build
         run: *build
 
@@ -427,12 +401,6 @@ jobs:
         run: ghcup --no-verbose install ghc --set --install-targets "${{ env.GHC_TARGETS }}" "${{ env.GHC_VERSION }}"
         shell: pwsh
 
-      - name: Cache stage0 cabal binary
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.CABAL_CACHE_PATH }}
-          key: cabal-v1-${{ env.ARTIFACT }}-${{ hashFiles('cabal.project.stage0') }}
-
       - name: Run build
         run: *build
         env:
@@ -505,22 +473,12 @@ jobs:
         run : |
           sudo pkg install -y emscripten
 
-      # Self-hosted runner: clean stale state but keep _build/cabal/ for caching.
-      # distclean includes clean (stage1/2/3 + config), but not clean-cabal.
-      - name: Clean stale build state
-        run: gmake distclean
-
-      - name: Cache stage0 cabal binary
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.CABAL_CACHE_PATH }}
-          key: cabal-v1-${{ env.ARTIFACT }}-${{ hashFiles('cabal.project.stage0') }}
-
       - name: Run build
         run: |
           which ghc
           ghc --info
           cabal update
+          gmake clean clean-cabal distclean
           gmake _build/dist/haskell-toolchain.tar.gz _build/dist/ghc.tar.gz _build/dist/cabal.tar.gz _build/dist/tests.tar.gz _build/dist/ghc-javascript-unknown-ghcjs.tar.gz
           cd _build/dist
           mv ghc.tar.gz ghc-$(bin/ghc --numeric-version)-${{ env.ARTIFACT }}.tar.gz

Makefile

@@ -540,9 +540,7 @@ all: stage2
 # | (_| (_| | |_) | (_| | |_____| | | | \__ \ || (_| | | |
 #  \___\__,_|_.__/ \__,_|_|     |_|_| |_|___/\__\__,_|_|_|
 
-# Not .PHONY: Make only rebuilds when the binary is missing.
-# Cache correctness is handled by the CI cache key (hashFiles('cabal.project.stage0')),
-# not by Make prerequisites.
+.PHONY: $(CABAL)
 $(CABAL): STAGE=stage0
 $(CABAL):
 	$(call PHASE_START,cabal)