1
0
forked from GitHub/gf-core

Install openjdk in macOS build

This commit is contained in:
John J. Camilleri
2020-11-18 23:08:49 +01:00
parent dbb0bcc5dd
commit 08af135653
3 changed files with 8 additions and 7 deletions

View File

@@ -13,16 +13,16 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest, macOS-latest, windows-latest] os: [ubuntu-latest, macos-latest, windows-latest]
cabal: ["3.2"] cabal: ["3.2"]
ghc: ghc:
- "8.6.5" - "8.6.5"
- "8.8.3" - "8.8.3"
- "8.10.1" - "8.10.1"
exclude: exclude:
- os: macOS-latest - os: macos-latest
ghc: 8.8.3 ghc: 8.8.3
- os: macOS-latest - os: macos-latest
ghc: 8.6.5 ghc: 8.6.5
- os: windows-latest - os: windows-latest
ghc: 8.8.3 ghc: 8.8.3
@@ -92,4 +92,4 @@ jobs:
# - name: Test # - name: Test
# run: | # run: |
# stack test --system-ghc # stack test --system-ghc

View File

@@ -10,7 +10,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [macOS-latest] os: [macos-10.15]
ghc: ["8.6.5"] ghc: ["8.6.5"]
cabal: ["2.4"] cabal: ["2.4"]
@@ -27,7 +27,8 @@ jobs:
- name: Install build tools - name: Install build tools
run: | run: |
brew install \ brew install \
automake automake \
openjdk
cabal v1-install alex happy cabal v1-install alex happy
- name: Build macOS package - name: Build macOS package

View File

@@ -9,7 +9,7 @@ jobs:
strategy: strategy:
fail-fast: true fail-fast: true
matrix: matrix:
os: [ubuntu-18.04, macos-latest] os: [ubuntu-18.04, macos-10.15]
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1