Skip to content

Commit

Permalink
Try in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
andreabedini committed Jan 29, 2025
1 parent 2c81554 commit 2903970
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 11 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ on:
- opened
- synchronize
push:
branches: [master]
branches:
- master
- andrea/make-build

jobs:
cabal:
Expand Down Expand Up @@ -65,17 +67,16 @@ jobs:
restore-keys: ${{ matrix.os }}-${{ matrix.ghc }}-
path: |
${{ steps.cabal-paths.outputs.store }}
libraries/Cabal/dist-newstyle
_build
- name: Configure the build
run: ./boot
dist-newstyle
- name: Build patched cabal
run: make cabal
run: |
cabal build --project-dir libraries/Cabal cabal-install:exe:cabal
CABAL=$(cabal list-bin -v0 --project-dir libraries/Cabal cabal-install:exe:cabal)
echo "CABAL=${CABAL}" >> $GITHUB_ENV
- name: Build the bindist
run: make
- name: Build stage1
run: ${CABAL} build --project-file cabal.project.stage0 ghc-bin:exe:ghc

- name: Save GHCup cache
uses: actions/cache/save@v4
Expand All @@ -98,5 +99,4 @@ jobs:
key: ${{ matrix.os }}-${{ matrix.ghc }}-${{ github.run_id }}
path: |
${{ steps.cabal-paths.outputs.store }}
libraries/Cabal/dist-newstyle
_build
dist-newstyle
44 changes: 44 additions & 0 deletions cabal.project.stage0
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
packages:
compiler
ghc
libraries/directory
libraries/file-io
libraries/filepath
libraries/ghc-platform
libraries/ghc-boot
libraries/ghc-boot-th
libraries/ghc-heap
libraries/ghci
libraries/os-string
libraries/process
libraries/semaphore-compat
libraries/time
libraries/unix
libraries/Win32
utils/ghc-pkg
utils/hsc2hs
utils/unlit
utils/genprimopcode
utils/genapply
utils/deriveConstants

benchmarks: False
tests: False
allow-boot-library-installs: True

package *
-- library-vanilla: True
shared: False
executable-profiling: False
-- executable-dynamic: False
-- executable-static: True

constraints:
-- for some reason 2.23 doesn't build
template-haskell <= 2.22

package ghc-boot-th
flags: +bootstrap

-- allow template-haskell with newer ghc-boot-th
allow-newer: ghc-boot-th

0 comments on commit 2903970

Please sign in to comment.