diff options
| author | John J. Camilleri <john@digitalgrammars.com> | 2020-11-18 23:08:49 +0100 |
|---|---|---|
| committer | John J. Camilleri <john@digitalgrammars.com> | 2020-11-18 23:08:49 +0100 |
| commit | 08af1356530de0d7d8dbcf095aab99911f5113ca (patch) | |
| tree | 9471ffa69ed1fcbdf3f699ebdf39436065a9a8f0 | |
| parent | dbb0bcc5dd7e85d5f790fa4d84a017d79e35b2ec (diff) | |
Install openjdk in macOS build
| -rw-r--r-- | .github/workflows/build-all-versions.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/build-macos-package.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/build-python-package.yml | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/.github/workflows/build-all-versions.yml b/.github/workflows/build-all-versions.yml index 52db74850..df71f0ac0 100644 --- a/.github/workflows/build-all-versions.yml +++ b/.github/workflows/build-all-versions.yml @@ -13,16 +13,16 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] cabal: ["3.2"] ghc: - "8.6.5" - "8.8.3" - "8.10.1" exclude: - - os: macOS-latest + - os: macos-latest ghc: 8.8.3 - - os: macOS-latest + - os: macos-latest ghc: 8.6.5 - os: windows-latest ghc: 8.8.3 @@ -92,4 +92,4 @@ jobs: # - name: Test # run: | - # stack test --system-ghc
\ No newline at end of file + # stack test --system-ghc diff --git a/.github/workflows/build-macos-package.yml b/.github/workflows/build-macos-package.yml index c01227791..e3ed3def2 100644 --- a/.github/workflows/build-macos-package.yml +++ b/.github/workflows/build-macos-package.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macOS-latest] + os: [macos-10.15] ghc: ["8.6.5"] cabal: ["2.4"] @@ -27,7 +27,8 @@ jobs: - name: Install build tools run: | brew install \ - automake + automake \ + openjdk cabal v1-install alex happy - name: Build macOS package diff --git a/.github/workflows/build-python-package.yml b/.github/workflows/build-python-package.yml index 921da9fb5..fef31a785 100644 --- a/.github/workflows/build-python-package.yml +++ b/.github/workflows/build-python-package.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-18.04, macos-latest] + os: [ubuntu-18.04, macos-10.15] steps: - uses: actions/checkout@v1 |