retire azure; simplify ghc -M; add new tests

shayne-fletcher · Jul 23, 2024 · 32a3330 · 32a3330
1 parent 464ff27
commit 32a3330
Show file tree

Hide file tree

Showing 9 changed files with 141 additions and 137 deletions.
diff --git a/.github/workflows/ghc-lib-da-ghc-8.4.3.yml b/.github/workflows/ghc-lib-da-ghc-8.4.3.yml
@@ -5,43 +5,35 @@ on:
 jobs:
   runhaskell:
     name: ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu, windows]
+        os: [ubuntu-latest, macos-13, windows-latest]
     steps:
       - uses: actions/checkout@v4
+      - uses: haskell-actions/setup@v2
+        id: setup-haskell
+        with:
+          ghc-version: 8.4.3
+          cabal-version: 'latest'
+      - name: Install build tools (macOS)
+        run: brew install automake
+        if: matrix.os == 'macos-13'
       - name: Configure msys2 (windows)
         shell: bash
         run: |-
           echo "MSYSTEM=CLANG64" >> $GITHUB_ENV
           echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
           echo "/c/msys64/usr/bin" >> $GITHUB_PATH
-        if: matrix.os == 'windows'
-      - name: Install ghcup (windows)
-        shell: bash
-        run: |-
-          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=8.4.3 BOOTSTRAP_HASKELL_CABAL_VERSION=latest BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
-          echo "/c/ghcup/bin" >> $GITHUB_PATH
-          echo "/c/ghcup/ghc/8.4.3/bin" >> $GITHUB_PATH
-          echo "/c/cabal/bin" >> $GITHUB_PATH
-        if: matrix.os == 'windows'
-      - name: Install ghcup (unix)
-        shell: bash
-        run: |-
-          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=8.4.3 BOOTSTRAP_HASKELL_CABAL_VERSION=latest BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
-          echo "$HOME/.ghcup/bin" >> $GITHUB_PATH
-          echo "$HOME/.ghcup/ghc/8.4.3/bin" >> $GITHUB_PATH
-          echo "$HOME/.cabal/bin" >> $GITHUB_PATH
-        if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
+        if: matrix.os == 'windows-latest'
       - name: Run CI.hs (windows)
         shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
         run: |-
           pacman -S autoconf automake-wrapper make patch python tar mintty --noconfirm
           cabal run exe:ghc-lib-build-tool -- --da
-        if: matrix.os == 'windows'
+        if: matrix.os == 'windows-latest'
       - name: Run CI.hs (unix)
         shell: bash
         run: cabal run exe:ghc-lib-build-tool -- --da
-        if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
+        if: matrix.os == 'ubuntu-latest' || matrix.os ==  'macos-13'
diff --git a/.github/workflows/ghc-lib-ghc-9.0.2-ghc-8.10.7.yml b/.github/workflows/ghc-lib-ghc-9.0.2-ghc-8.10.7.yml
@@ -0,0 +1,39 @@
+name: ghc-lib-ghc-9.0.2-ghc-8.10.7
+on:
+  push:
+  pull_request:
+jobs:
+  runhaskell:
+    name: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-13, windows-latest]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: haskell-actions/setup@v2
+        id: setup-haskell
+        with:
+          ghc-version: 8.10.7
+          cabal-version: 'latest'
+      - name: Install build tools (macOS)
+        run: brew install automake
+        if: matrix.os == 'macos-13'
+      - name: Configure msys2 (windows)
+        shell: bash
+        run: |-
+          echo "MSYSTEM=CLANG64" >> $GITHUB_ENV
+          echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
+          echo "/c/msys64/usr/bin" >> $GITHUB_PATH
+        if: matrix.os == 'windows-latest'
+      - name: Run CI.hs (windows)
+        shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
+        run: |-
+          pacman -S autoconf automake-wrapper make patch python tar mintty --noconfirm
+          cabal run exe:ghc-lib-build-tool --constraint=any."happy==1.19.12" --constraint="any.alex==3.2.7.3" -- --ghc-flavor ghc-9.0.2
+        if: matrix.os == 'windows-latest'
+      - name: Run CI.hs (unix)
+        shell: bash
+        run: cabal run exe:ghc-lib-build-tool --constraint="any.happy==1.19.12" --constraint="any.alex==3.2.7.3" -- --ghc-flavor ghc-9.0.2
+        if: matrix.os == 'ubuntu-latest' || matrix.os ==  'macos-13'
diff --git a/.github/workflows/ghc-lib-ghc-9.10.1-ghc-9.8.2.yml b/.github/workflows/ghc-lib-ghc-9.10.1-ghc-9.8.2.yml
@@ -12,6 +12,11 @@ jobs:
         os: [ubuntu, macos, windows]
     steps:
       - uses: actions/checkout@v4
+      - uses: haskell-actions/setup@v2
+        id: setup-haskell
+        with:
+          ghc-version: 9.8.2
+          cabal-version: 'latest'
       - name: Install build tools (macOS)
         run: brew install automake
         if: matrix.os == 'macos'
@@ -22,22 +27,6 @@ jobs:
           echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
           echo "/c/msys64/usr/bin" >> $GITHUB_PATH
         if: matrix.os == 'windows'
-      - name: Install ghcup (windows)
-        shell: bash
-        run: |-
-          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.8.2 BOOTSTRAP_HASKELL_CABAL_VERSION=latest BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
-          echo "/c/ghcup/bin" >> $GITHUB_PATH
-          echo "/c/ghcup/ghc/9.8.2/bin" >> $GITHUB_PATH
-          echo "/c/cabal/bin" >> $GITHUB_PATH
-        if: matrix.os == 'windows'
-      - name: Install ghcup (unix)
-        shell: bash
-        run: |-
-          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.8.2 BOOTSTRAP_HASKELL_CABAL_VERSION=latest BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
-          echo "$HOME/.ghcup/bin" >> $GITHUB_PATH
-          echo "$HOME/.ghcup/ghc/9.8.2/bin" >> $GITHUB_PATH
-          echo "$HOME/.cabal/bin" >> $GITHUB_PATH
-        if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
       - name: Run CI.hs (windows)
         shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
         run: |-

diff --git a/.github/workflows/ghc-lib-ghc-9.4.8-ghc-9.0.2.yml b/.github/workflows/ghc-lib-ghc-9.4.8-ghc-9.0.2.yml
@@ -0,0 +1,39 @@
+name: ghc-lib-ghc-9.4.8-ghc-9.0.2
+on:
+  push:
+  pull_request:
+jobs:
+  runhaskell:
+    name: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-13, windows-latest]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: haskell-actions/setup@v2
+        id: setup-haskell
+        with:
+          ghc-version: 9.0.2
+          cabal-version: 'latest'
+      - name: Install build tools (macOS)
+        run: brew install automake
+        if: matrix.os == 'macos-13'
+      - name: Configure msys2 (windows)
+        shell: bash
+        run: |-
+          echo "MSYSTEM=CLANG64" >> $GITHUB_ENV
+          echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
+          echo "/c/msys64/usr/bin" >> $GITHUB_PATH
+        if: matrix.os == 'windows-latest'
+      - name: Run CI.hs (windows)
+        shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
+        run: |-
+          pacman -S autoconf automake-wrapper make patch python tar mintty --noconfirm
+          cabal run exe:ghc-lib-build-tool -- --ghc-flavor ghc-9.4.8
+        if: matrix.os == 'windows-latest'
+      - name: Run CI.hs (unix)
+        shell: bash
+        run: cabal run exe:ghc-lib-build-tool -- --ghc-flavor ghc-9.4.8
+        if: matrix.os == 'ubuntu-latest' || matrix.os ==  'macos-13'
diff --git a/.github/workflows/ghc-lib-ghc-9.8.2-ghc-9.6.5.yml b/.github/workflows/ghc-lib-ghc-9.8.2-ghc-9.6.5.yml
@@ -12,6 +12,11 @@ jobs:
         os: [ubuntu, macos, windows]
     steps:
       - uses: actions/checkout@v4
+      - uses: haskell-actions/setup@v2
+        id: setup-haskell
+        with:
+          ghc-version: 9.6.5
+          cabal-version: 'latest'
       - name: Install build tools (macOS)
         run: brew install automake
         if: matrix.os == 'macos'
@@ -22,22 +27,6 @@ jobs:
           echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
           echo "/c/msys64/usr/bin" >> $GITHUB_PATH
         if: matrix.os == 'windows'
-      - name: Install ghcup (windows)
-        shell: bash
-        run: |-
-          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.6.5 BOOTSTRAP_HASKELL_CABAL_VERSION=latest BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
-          echo "/c/ghcup/bin" >> $GITHUB_PATH
-          echo "/c/ghcup/ghc/9.6.5/bin" >> $GITHUB_PATH
-          echo "/c/cabal/bin" >> $GITHUB_PATH
-        if: matrix.os == 'windows'
-      - name: Install ghcup (unix)
-        shell: bash
-        run: |-
-          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.6.5 BOOTSTRAP_HASKELL_CABAL_VERSION=latest BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
-          echo "$HOME/.ghcup/bin" >> $GITHUB_PATH
-          echo "$HOME/.ghcup/ghc/9.6.5/bin" >> $GITHUB_PATH
-          echo "$HOME/.cabal/bin" >> $GITHUB_PATH
-        if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
       - name: Run CI.hs (windows)
         shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
         run: |-

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
@@ -12,6 +12,11 @@ jobs:
         os: [ubuntu, macos, windows]
     steps:
       - uses: actions/checkout@v4
+      - uses: haskell-actions/setup@v2
+        id: setup-haskell
+        with:
+          ghc-version: 9.10.1
+          cabal-version: 'latest'
       - name: Install build tools (macOS)
         run: brew install automake
         if: matrix.os == 'macos'
@@ -22,23 +27,6 @@ jobs:
           echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
           echo "/c/msys64/usr/bin" >> $GITHUB_PATH
         if: matrix.os == 'windows'
-      - name: Install ghcup (windows)
-        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
-          echo "/c/ghcup/bin" >> $GITHUB_PATH
-          echo "/c/ghcup/ghc/9.10.1/bin" >> $GITHUB_PATH
-          echo "/c/cabal/bin" >> $GITHUB_PATH
-        if: matrix.os == 'windows'
-      - name: Install ghcup (unix)
-        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
-          ls "$HOME"/.ghcup/bin
-          echo "$HOME/.ghcup/bin" >> $GITHUB_PATH
-          echo "$HOME/.ghcup/ghc/9.10.1/bin" >> $GITHUB_PATH
-          echo "$HOME/.cabal/bin" >> $GITHUB_PATH
-        if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
       - name: Run CI.hs (windows)
         shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
         run: |-

diff --git a/CI.hs b/CI.hs
@@ -184,6 +184,7 @@ genVersionStr flavor suffix =
       Ghc942      -> "9.4.2"
       Ghc941      -> "9.4.1"
       Ghc928      -> "9.2.8"
+      Ghc927      -> "9.2.7"
       Ghc926      -> "9.2.6"
       Ghc925      -> "9.2.5"
       Ghc924      -> "9.2.4"

diff --git a/ghc-lib-gen.cabal b/ghc-lib-gen.cabal
@@ -1,6 +1,6 @@
 cabal-version: 3.4
 name: ghc-lib-gen
-version: 0.1.0.0
+version: 0.1.0
 synopsis: Cabal file generator for GHC as a library
 description: Generate a cabal file for a subset of GHC for use as a library.
 homepage:https://github.com/digital-asset/ghc-lib
@@ -21,9 +21,9 @@ flag semaphore-compat
 common base
   default-language: Haskell2010
   ghc-options:
-    -Wall -Wincomplete-record-updates
-    -Wredundant-constraints -Widentities
-    -Wno-simplifiable-class-constraints
+  ghc-options:
+    -Wall -Wincomplete-record-updates -Wredundant-constraints -Widentities
+    -Wunused-imports -Wno-name-shadowing
   build-depends: base >= 4.10 && < 5
 
 common lib