From ed21e250b22e1c6d66658b196fa0500a719f5d04 Mon Sep 17 00:00:00 2001 From: Cheng Shao Date: Fri, 8 Nov 2024 16:24:45 +0000 Subject: [PATCH] Revert "Use perf flavour again since !13476 landed" This reverts commit ba795ae57c6c4be6b033e7bc320fcffe52d690f6. 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) --- .github/workflows/darwin-bindist.yml | 4 ++-- alpine-build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/darwin-bindist.yml b/.github/workflows/darwin-bindist.yml index b314a89..ec1cf73 100644 --- a/.github/workflows/darwin-bindist.yml +++ b/.github/workflows/darwin-bindist.yml @@ -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 @@ -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 diff --git a/alpine-build.sh b/alpine-build.sh index 4ea9f0e..3a53da6 100755 --- a/alpine-build.sh +++ b/alpine-build.sh @@ -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"