Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename OSX jobs, drop 8.8.2 #6579

Merged
merged 1 commit into from
Mar 11, 2020
Merged

Rename OSX jobs, drop 8.8.2 #6579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 3 additions & 54 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -69,61 +69,10 @@ 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
needs: validate-macos-8_8_3
steps:
- name: Install Autotools
run: |
Expand Down
2 changes: 1 addition & 1 deletion boot/ci-macos.template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 1 addition & 3 deletions cabal-dev-scripts/src/GenValidate.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -133,7 +131,7 @@ mkMacGhcJob v u = MacGhcJob
{ mgjVersion = v
, mgjGhcUrl = u
, mgjFlags = ""
, mgjNeeds = ["8.8.2" | not $ "8.8" `isPrefixOf` v ]
, mgjNeeds = ["8.8.3" | not $ "8.8" `isPrefixOf` v ]
, mgjSteps = defSteps
}

Expand Down