Rename OSX jobs, drop 8.8.2

haskell · Mar 11, 2020 · 2d0ed15 · 2d0ed15
1 parent 866f0f8
commit 2d0ed15
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 56 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -19,7 +19,7 @@ on:
 
 jobs:
   validate-macos-8_8_3:
-    name: validate.sh ghc-8.8.3
+    name: validate.sh macos ghc-8.8.3
     runs-on: macos-latest
     steps:
       - name: Install Autotools
@@ -69,59 +69,8 @@ jobs:
         run: sh validate.sh -j 2 -w ghc-8.8.3 -v  -s cli-tests
       - name: Validate cli-suite
         run: sh validate.sh -j 2 -w ghc-8.8.3 -v  -s cli-suite
-  validate-macos-8_8_2:
-    name: validate.sh ghc-8.8.2
-    runs-on: macos-latest
-    steps:
-      - name: Install Autotools
-        run: |
-          brew install automake
-      - name: Install GHC
-        run: |
-          cd $(mktemp -d)
-          curl -sLO https://downloads.haskell.org/~ghc/8.8.2/ghc-8.8.2-x86_64-apple-darwin.tar.xz
-          tar -xJf ghc-*.tar.xz
-          cd ghc-*
-          ./configure --prefix=/opt/ghc/8.8.2
-          sudo make install
-      - name: Install Cabal
-        run: |
-          cd $(mktemp -d)
-          curl -sLO https://downloads.haskell.org/~cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-x86_64-apple-darwin17.7.0.tar.xz
-          tar -xJf cabal-install-*.tar.xz
-          sudo mkdir -p /opt/cabal/3.0/bin
-          sudo cp cabal /opt/cabal/3.0/bin/cabal
-          sudo chmod 755 /opt/cabal/3.0/bin/cabal
-      - name: Set PATH
-        run: |
-          echo "::add-path::/opt/ghc/8.8.2/bin"
-          echo "::add-path::/opt/cabal/3.0/bin"
-          echo "::add-path::$HOME/.cabal/bin"
-      - name: Update Hackage index
-        run: cabal v2-update
-      - name: Install cabal-plan
-        run: |
-          cd $(mktemp -d)
-          cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast'
-      - uses: actions/checkout@v2
-      - name: Validate print-config
-        run: sh validate.sh -j 2 -w ghc-8.8.2 -v  -s print-config
-      - name: Validate print-tool-versions
-        run: sh validate.sh -j 2 -w ghc-8.8.2 -v  -s print-tool-versions
-      - name: Validate make-cabal-install-dev
-        run: sh validate.sh -j 2 -w ghc-8.8.2 -v  -s make-cabal-install-dev
-      - name: Validate build
-        run: sh validate.sh -j 2 -w ghc-8.8.2 -v  -s build
-      - name: Validate lib-tests
-        run: sh validate.sh -j 2 -w ghc-8.8.2 -v  -s lib-tests
-      - name: Validate lib-suite
-        run: sh validate.sh -j 2 -w ghc-8.8.2 -v  -s lib-suite
-      - name: Validate cli-tests
-        run: sh validate.sh -j 2 -w ghc-8.8.2 -v  -s cli-tests
-      - name: Validate cli-suite
-        run: sh validate.sh -j 2 -w ghc-8.8.2 -v  -s cli-suite
   validate-macos-8_6_5:
-    name: validate.sh ghc-8.6.5
+    name: validate.sh macos ghc-8.6.5
     runs-on: macos-latest
     needs: validate-macos-8_8_2
     steps:

diff --git a/boot/ci-macos.template.yml b/boot/ci-macos.template.yml
@@ -20,7 +20,7 @@ on:
 jobs:
 {% for job in macosJobs %}
   validate-macos-{{ mangleVersion job.version }}:
-    name: validate.sh ghc-{{job.version}}
+    name: validate.sh macos ghc-{{job.version}}
     runs-on: macos-latest
 {% for needs in job.needs %}
     needs: validate-macos-{{ mangleVersion needs }}

diff --git a/cabal-dev-scripts/src/GenValidate.hs b/cabal-dev-scripts/src/GenValidate.hs
@@ -38,8 +38,6 @@ main = do
                     ]
                 , zMacosJobs =
                     [ mkMacGhcJob "8.8.3" "https://downloads.haskell.org/~ghc/8.8.3/ghc-8.8.3-x86_64-apple-darwin.tar.xz"
-                    -- we have 8.8.2 job as something weird is going with 8.8.3 one.
-                    , mkMacGhcJob "8.8.2" "https://downloads.haskell.org/~ghc/8.8.2/ghc-8.8.2-x86_64-apple-darwin.tar.xz"
                     , mkMacGhcJob "8.6.5" "https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-x86_64-apple-darwin.tar.xz"
                     ]
                 , zWinJobs =