Skip to content

Commit

Permalink
Revert "Use perf flavour again since !13476 landed"
Browse files Browse the repository at this point in the history
This reverts commit ba795ae. We do
need the hi-haddock info built in release flavour for the :info ghci
command to work. (and also HLS, when I actually get to look into HLS
support in the future)
  • Loading branch information
TerrorJack committed Nov 8, 2024
1 parent 8bd86b0 commit ed21e25
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/darwin-bindist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- name: build-ghc
working-directory: ${{ runner.temp }}/ghc
run: |
hadrian/build --no-color --no-progress --no-time --flavour=perf+text_simdutf --docs=none -j binary-dist-dir test:all_deps _build/stage0/bin/wasm32-wasi-{haddock,hpc,runghc}
hadrian/build --no-color --no-progress --no-time --flavour=release+text_simdutf --docs=none -j binary-dist-dir test:all_deps _build/stage0/bin/wasm32-wasi-{haddock,hpc,runghc}
- name: build-bindist
working-directory: ${{ runner.temp }}/ghc
Expand All @@ -78,4 +78,4 @@ jobs:
- name: test-ghc
working-directory: ${{ runner.temp }}/ghc
run: |
hadrian/build --no-color --no-progress --no-time --flavour=perf+text_simdutf --docs=none -j test
hadrian/build --no-color --no-progress --no-time --flavour=release+text_simdutf --docs=none -j test
4 changes: 2 additions & 2 deletions alpine-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ cabal install \

./configure --host="$(uname -m)-alpine-linux" --target=wasm32-wasi --with-intree-gmp --with-system-libffi

hadrian/build --no-color --no-progress --no-time --flavour=perf+host_fully_static+text_simdutf --docs=none -j binary-dist-dir test:all_deps _build/stage0/bin/wasm32-wasi-haddock _build/stage0/bin/wasm32-wasi-hpc _build/stage0/bin/wasm32-wasi-runghc
hadrian/build --no-color --no-progress --no-time --flavour=release+host_fully_static+text_simdutf --docs=none -j binary-dist-dir test:all_deps _build/stage0/bin/wasm32-wasi-haddock _build/stage0/bin/wasm32-wasi-hpc _build/stage0/bin/wasm32-wasi-runghc

BINDIST_NAME=$(basename _build/bindist/*)

tar --sort=name --mtime="@$(git log -1 --pretty=%ct)" --owner=0 --group=0 --numeric-owner --use-compress-program="zstd --ultra -22 --threads=0" -cf /workspace/$BINDIST_NAME.tar.zst -C _build/bindist $BINDIST_NAME

hadrian/build --no-color --no-progress --no-time --flavour=perf+host_fully_static+text_simdutf --docs=none -j test
hadrian/build --no-color --no-progress --no-time --flavour=release+host_fully_static+text_simdutf --docs=none -j test

cd "$OLDPWD"

0 comments on commit ed21e25

Please sign in to comment.