udate test

haskell-CI · Nov 11, 2024 · e92eecc · e92eecc
1 parent 1fbf549
commit e92eecc
Show file tree

Hide file tree

Showing 13 changed files with 263 additions and 361 deletions.
diff --git a/fixtures/all-versions.github b/fixtures/all-versions.github
@@ -28,15 +28,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghcjs-8.4
-            compilerKind: ghcjs
-            compilerVersion: "8.4"
-            setup-method: hvr-ppa
-            allow-failure: false
           - compiler: ghc-9.12.0.20241031
             compilerKind: ghc
             compilerVersion: 9.12.0.20241031
-            setup-method: ghcup
+            setup-method: ghcup-prerelease
             allow-failure: false
           - compiler: ghc-9.10.1
             compilerKind: ghc
@@ -46,7 +41,7 @@ jobs:
           - compiler: ghc-9.8.3
             compilerKind: ghc
             compilerVersion: 9.8.3
-            setup-method: ghcup
+            setup-method: ghcup-vanilla
             allow-failure: false
           - compiler: ghc-9.8.2
             compilerKind: ghc
@@ -258,52 +253,32 @@ jobs:
             compilerVersion: 8.6.1
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-8.4.4
-            compilerKind: ghc
-            compilerVersion: 8.4.4
-            setup-method: ghcup
-            allow-failure: false
-          - compiler: ghc-8.4.3
-            compilerKind: ghc
-            compilerVersion: 8.4.3
-            setup-method: ghcup
-            allow-failure: false
-          - compiler: ghc-8.4.2
-            compilerKind: ghc
-            compilerVersion: 8.4.2
-            setup-method: ghcup
-            allow-failure: false
-          - compiler: ghc-8.4.1
-            compilerKind: ghc
-            compilerVersion: 8.4.1
-            setup-method: ghcup
-            allow-failure: false
           - compiler: ghc-8.2.2
             compilerKind: ghc
             compilerVersion: 8.2.2
-            setup-method: ghcup
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.2.1
             compilerKind: ghc
             compilerVersion: 8.2.1
-            setup-method: ghcup
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.0.2
             compilerKind: ghc
             compilerVersion: 8.0.2
-            setup-method: ghcup
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.0.1
             compilerKind: ghc
             compilerVersion: 8.0.1
-            setup-method: ghcup
+            setup-method: hvr-ppa
             allow-failure: false
       fail-fast: false
     steps:
       - name: apt-get install
         run: |
           apt-get update
-          apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
+          apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
       - name: Install GHCup
         run: |
           mkdir -p "$HOME/.ghcup/bin"
@@ -313,6 +288,20 @@ jobs:
         run: |
           "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
           echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+      - name: Install GHC (hvr-ppa)
+        if: matrix.setup-method == 'hvr-ppa'
+        run: |
+          apt-add-repository -y 'ppa:hvr/ghc'
+          apt-get update
+          apt-get install -y "$HCNAME"
+          HC=$HCDIR/bin/$HCKIND
+          echo "HC=$HC" >> "$GITHUB_ENV"
+          echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
+          echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
+        env:
+          HCKIND: ${{ matrix.compilerKind }}
+          HCNAME: ${{ matrix.compiler }}
+          HCVER: ${{ matrix.compilerVersion }}
       - name: Install GHC (GHCup)
         if: matrix.setup-method == 'ghcup'
         run: |
@@ -330,7 +319,7 @@ jobs:
       - name: Install GHC (GHCup vanilla)
         if: matrix.setup-method == 'ghcup-vanilla'
         run: |
-          "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
+          "$HOME/.ghcup/bin/ghcup" -s https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-vanilla-0.0.8.yaml install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
           HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
           HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
           HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')

diff --git a/fixtures/copy-fields-all.github b/fixtures/copy-fields-all.github
@@ -108,52 +108,32 @@ jobs:
             compilerVersion: 8.6.1
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-8.4.4
-            compilerKind: ghc
-            compilerVersion: 8.4.4
-            setup-method: ghcup
-            allow-failure: false
-          - compiler: ghc-8.4.3
-            compilerKind: ghc
-            compilerVersion: 8.4.3
-            setup-method: ghcup
-            allow-failure: false
-          - compiler: ghc-8.4.2
-            compilerKind: ghc
-            compilerVersion: 8.4.2
-            setup-method: ghcup
-            allow-failure: false
-          - compiler: ghc-8.4.1
-            compilerKind: ghc
-            compilerVersion: 8.4.1
-            setup-method: ghcup
-            allow-failure: false
           - compiler: ghc-8.2.2
             compilerKind: ghc
             compilerVersion: 8.2.2
-            setup-method: ghcup
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.2.1
             compilerKind: ghc
             compilerVersion: 8.2.1
-            setup-method: ghcup
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.0.2
             compilerKind: ghc
             compilerVersion: 8.0.2
-            setup-method: ghcup
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.0.1
             compilerKind: ghc
             compilerVersion: 8.0.1
-            setup-method: ghcup
+            setup-method: hvr-ppa
             allow-failure: false
       fail-fast: false
     steps:
       - name: apt-get install
         run: |
           apt-get update
-          apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
+          apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
       - name: Install GHCup
         run: |
           mkdir -p "$HOME/.ghcup/bin"
@@ -163,6 +143,20 @@ jobs:
         run: |
           "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
           echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+      - name: Install GHC (hvr-ppa)
+        if: matrix.setup-method == 'hvr-ppa'
+        run: |
+          apt-add-repository -y 'ppa:hvr/ghc'
+          apt-get update
+          apt-get install -y "$HCNAME"
+          HC=$HCDIR/bin/$HCKIND
+          echo "HC=$HC" >> "$GITHUB_ENV"
+          echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
+          echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
+        env:
+          HCKIND: ${{ matrix.compilerKind }}
+          HCNAME: ${{ matrix.compiler }}
+          HCVER: ${{ matrix.compilerVersion }}
       - name: Install GHC (GHCup)
         if: matrix.setup-method == 'ghcup'
         run: |

diff --git a/fixtures/copy-fields-none.github b/fixtures/copy-fields-none.github
@@ -108,52 +108,32 @@ jobs:
             compilerVersion: 8.6.1
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-8.4.4
-            compilerKind: ghc
-            compilerVersion: 8.4.4
-            setup-method: ghcup
-            allow-failure: false
-          - compiler: ghc-8.4.3
-            compilerKind: ghc
-            compilerVersion: 8.4.3
-            setup-method: ghcup
-            allow-failure: false
-          - compiler: ghc-8.4.2
-            compilerKind: ghc
-            compilerVersion: 8.4.2
-            setup-method: ghcup
-            allow-failure: false
-          - compiler: ghc-8.4.1
-            compilerKind: ghc
-            compilerVersion: 8.4.1
-            setup-method: ghcup
-            allow-failure: false
           - compiler: ghc-8.2.2
             compilerKind: ghc
             compilerVersion: 8.2.2
-            setup-method: ghcup
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.2.1
             compilerKind: ghc
             compilerVersion: 8.2.1
-            setup-method: ghcup
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.0.2
             compilerKind: ghc
             compilerVersion: 8.0.2
-            setup-method: ghcup
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.0.1
             compilerKind: ghc
             compilerVersion: 8.0.1
-            setup-method: ghcup
+            setup-method: hvr-ppa
             allow-failure: false
       fail-fast: false
     steps:
       - name: apt-get install
         run: |
           apt-get update
-          apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
+          apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
       - name: Install GHCup
         run: |
           mkdir -p "$HOME/.ghcup/bin"
@@ -163,6 +143,20 @@ jobs:
         run: |
           "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
           echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+      - name: Install GHC (hvr-ppa)
+        if: matrix.setup-method == 'hvr-ppa'
+        run: |
+          apt-add-repository -y 'ppa:hvr/ghc'
+          apt-get update
+          apt-get install -y "$HCNAME"
+          HC=$HCDIR/bin/$HCKIND
+          echo "HC=$HC" >> "$GITHUB_ENV"
+          echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
+          echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
+        env:
+          HCKIND: ${{ matrix.compilerKind }}
+          HCNAME: ${{ matrix.compiler }}
+          HCVER: ${{ matrix.compilerVersion }}
       - name: Install GHC (GHCup)
         if: matrix.setup-method == 'ghcup'
         run: |

diff --git a/fixtures/copy-fields-some.github b/fixtures/copy-fields-some.github
@@ -108,52 +108,32 @@ jobs:
             compilerVersion: 8.6.1
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-8.4.4
-            compilerKind: ghc
-            compilerVersion: 8.4.4
-            setup-method: ghcup
-            allow-failure: false
-          - compiler: ghc-8.4.3
-            compilerKind: ghc
-            compilerVersion: 8.4.3
-            setup-method: ghcup
-            allow-failure: false
-          - compiler: ghc-8.4.2
-            compilerKind: ghc
-            compilerVersion: 8.4.2
-            setup-method: ghcup
-            allow-failure: false
-          - compiler: ghc-8.4.1
-            compilerKind: ghc
-            compilerVersion: 8.4.1
-            setup-method: ghcup
-            allow-failure: false
           - compiler: ghc-8.2.2
             compilerKind: ghc
             compilerVersion: 8.2.2
-            setup-method: ghcup
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.2.1
             compilerKind: ghc
             compilerVersion: 8.2.1
-            setup-method: ghcup
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.0.2
             compilerKind: ghc
             compilerVersion: 8.0.2
-            setup-method: ghcup
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.0.1
             compilerKind: ghc
             compilerVersion: 8.0.1
-            setup-method: ghcup
+            setup-method: hvr-ppa
             allow-failure: false
       fail-fast: false
     steps:
       - name: apt-get install
         run: |
           apt-get update
-          apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
+          apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
       - name: Install GHCup
         run: |
           mkdir -p "$HOME/.ghcup/bin"
@@ -163,6 +143,20 @@ jobs:
         run: |
           "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
           echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+      - name: Install GHC (hvr-ppa)
+        if: matrix.setup-method == 'hvr-ppa'
+        run: |
+          apt-add-repository -y 'ppa:hvr/ghc'
+          apt-get update
+          apt-get install -y "$HCNAME"
+          HC=$HCDIR/bin/$HCKIND
+          echo "HC=$HC" >> "$GITHUB_ENV"
+          echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
+          echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
+        env:
+          HCKIND: ${{ matrix.compilerKind }}
+          HCNAME: ${{ matrix.compiler }}
+          HCVER: ${{ matrix.compilerVersion }}
       - name: Install GHC (GHCup)
         if: matrix.setup-method == 'ghcup'
         run: |