try customizing the bash

shayne-fletcher · Jul 14, 2024 · 1a65da7 · 1a65da7
1 parent 63013bf
commit 1a65da7
Showing 1 changed file with 33 additions and 31 deletions.
diff --git a/.github/workflows/ghc-lib-ghc-master-ghc-9.10.1.yml b/.github/workflows/ghc-lib-ghc-master-ghc-9.10.1.yml
@@ -18,41 +18,43 @@ jobs:
         shell: bash
         run: |-
           curl -L https://github.com/commercialhaskell/stackage-content/releases/download/msys2-20230526/msys2-20230526-x86_64.tar.xz -o msys2-20230526-x86_64.tar.xz
-          tar xvf msys2-20230526-x86_64.tar.xz > /dev/null
-          echo  "GHCUP_MSYS2=$(pwd)/msys64" >> $GITHUB_ENV
+          dir=$(pwd)
+          cd /c/ && tar xvf $dir/msys2-20230526-x86_64.tar.xz > /dev/null
+          echo  "GHCUP_MSYS2=/c/msys64" >> $GITHUB_ENV
         if: matrix.os == 'windows'
-      - name: Install ghcup
-        shell: bash
-        run: |-
-          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | \
-            BOOTSTRAP_HASKELL_NONINTERACTIVE=1 \
-            BOOTSTRAP_HASKELL_GHC_VERSION=9.10.1 \
-            BOOTSTRAP_HASKELL_CABAL_VERSION=latest \
-            BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 \
-            BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 \
-            BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
-      - name: Setup cabal (windows)
-        shell: bash
-        run: |-
-          PATH=/c/cabal/bin:/c/.ghcup/ghc-9.10.1/bin:/c/.ghcup/bin:$PATH
-          export PATH
-          cabal install alex happy
-          cabal --store-dir="c:\\cabal\\store" --lib --force-reinstalls --package-env=- install extra-1.7.16 optparse-applicative-0.18.1.0
-        if: matrix.os == 'windows'
-      - name: Setup cabal(unix)
-        shell: bash
-        run: |-
-          PATH="$HOME/.cabal/bin":"$HOME/.ghcup/ghc/9.10.1/bin":"$HOME/.ghcup/bin":"$PATH"
-          export PATH
-          cabal install alex happy
-          cabal --store-dir=$HOME/.cabal/store --lib --force-reinstalls --package-env=- install extra-1.7.16 optparse-applicative-0.18.1.0
-        if: matrix.os == 'ubuntu' || matrix.os == 'macos'
+      # - name: Install ghcup
+      #   shell: bash
+      #   run: |-
+      #     curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | \
+      #       BOOTSTRAP_HASKELL_NONINTERACTIVE=1 \
+      #       BOOTSTRAP_HASKELL_GHC_VERSION=9.10.1 \
+      #       BOOTSTRAP_HASKELL_CABAL_VERSION=latest \
+      #       BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 \
+      #       BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 \
+      #       BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
+      # - name: Setup cabal (windows)
+      #   shell: bash
+      #   run: |-
+      #     PATH=/c/cabal/bin:/c/.ghcup/ghc-9.10.1/bin:/c/.ghcup/bin:$PATH
+      #     export PATH
+      #     cabal install alex happy
+      #     cabal --store-dir="c:\\cabal\\store" --lib --force-reinstalls --package-env=- install extra-1.7.16 optparse-applicative-0.18.1.0
+      #   if: matrix.os == 'windows'
+      # - name: Setup cabal(unix)
+      #   shell: bash
+      #   run: |-
+      #     PATH="$HOME/.cabal/bin":"$HOME/.ghcup/ghc/9.10.1/bin":"$HOME/.ghcup/bin":"$PATH"
+      #     export PATH
+      #     cabal install alex happy
+      #     cabal --store-dir=$HOME/.cabal/store --lib --force-reinstalls --package-env=- install extra-1.7.16 optparse-applicative-0.18.1.0
+      #   if: matrix.os == 'ubuntu' || matrix.os == 'macos'
       - name: Run CI.hs (windows)
-        shell: bash
+        shell: C:/msys64/usr/bin/bash --noprofile --no-rc -e -o pipefail {0}
         run: |-
-          PATH=/c/cabal/bin:/c/ghcup/ghc/9.10.1/bin:/c/ghcup/bin:"$GHCUP_MSYS2"/usr/bin:/c/mingw64/bin:"/c/program files/git/bin":"$PATH"
+          PATH="c:/cabal/bin":"c:/ghcup/ghc/9.10.1/bin":"c:/ghcup/bin":"c:/msys64/usr/bin":"c:/mingw64/bin:"c:/program files/git/bin":$PATH
           export PATH
-          $GHCUP_MSYS2/usr/bin/bash --noprofile --norc -e -o pipefail -c "set -x && pacman -S autoconf automake-wrapper make patch python tar mintty --noconfirm &&  runghc --ghc-arg=-clear-package-db --ghc-arg=-global-package-db --ghc-arg=-user-package-db --ghc-arg=-package-db --ghc-arg=/c/cabal/store/$(ls /c/cabal/store)/package.db CI.hs --ghc-flavor ghc-master"
+          # pacman -S autoconf automake-wrapper make patch python tar mintty --noconfirm
+          # runghc --ghc-arg=-clear-package-db --ghc-arg=-global-package-db --ghc-arg=-user-package-db --ghc-arg=-package-db --ghc-arg=/c/cabal/store/$(ls /c/cabal/store)/package.db CI.hs --ghc-flavor ghc-master
         if: matrix.os == 'windows'
       - name: Run CI.hs (unix)
         shell: bash