diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 9fec97e..9c0d179 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -118,10 +118,11 @@ jobs: path: | ${HOME}/.cache/cabal/packages ${HOME}/.cabal/store - ${{ github.workspace }}/dist-newstyle key: ${{ env.key }}-plan-${{ hashFiles('**/plan.json') }} restore-keys: ${{ env.key }}- + # ${{ github.workspace }}/dist-newstyle + - name: Install dependencies # If we had an exact cache hit, the dependencies will be up to date. if: steps.cache.outputs.cache-hit != 'true' @@ -137,9 +138,9 @@ jobs: path: | ${HOME}/.cache/cabal/packages ${HOME}/.cabal/store - ${{ github.workspace }}/dist-newstyle key: ${{ steps.cache.outputs.cache-primary-key }} + # ${{ github.workspace }}/dist-newstyle - name: "Inspect cache: ~/.cache/cabal/packages" run: | echo "${HOME}/.cache/cabal/packages" || true @@ -182,7 +183,7 @@ jobs: ls -R "${{github.workspace }}/dist-newstyle/build" mkdir -p "${{ github.workspace }}/bin" cp "$(find ${{ github.workspace }}/dist-newstyle \ - ( -name spex -o -name spex-demo-petstore ) -type f -executable)" \ + \( -name spex -o -name spex-demo-petstore \) -type f -executable)" \ "${{ github.workspace }}/bin" - name: Create new git tag, if merge to main and .cabal version is bumped diff --git a/release/Makefile b/release/Makefile index dddfd7d..c669a3d 100644 --- a/release/Makefile +++ b/release/Makefile @@ -19,15 +19,15 @@ static-build: build-image cache/cabal-store-musl \ cache/dist-newstyle-musl docker run \ - -v "${PWD}/..":/mnt/:ro \ + -v "${PWD}/..":/mnt/ \ -v "${PWD}/cache/cabal-cache-musl":/root/.cache/cabal/packages \ -v "${PWD}/cache/cabal-store-musl":/root/.local/state/cabal/store \ -v "${PWD}/cache/dist-newstyle-musl":/mnt/dist-newstyle \ ghcr.io/spex-lang/static-build:$(GHC_VERSION) \ - update hackage.haskell.org,@1729577343 \ + update hackage.haskell.org,@1729577343 docker run \ -v "${PWD}/..":/mnt/:ro \ - -v "${PWD}/cache/cabal-cache-musl":/root/.cache/cabal \ + -v "${PWD}/cache/cabal-cache-musl":/root/.cache/cabal/packages \ -v "${PWD}/cache/cabal-store-musl":/root/.local/state/cabal/store \ -v "${PWD}/cache/dist-newstyle-musl":/mnt/dist-newstyle \ ghcr.io/spex-lang/static-build:$(GHC_VERSION) \