From 7b4eeb368ceaa89bdd23500822e72f1a908cffb4 Mon Sep 17 00:00:00 2001 From: Andreas Källberg Date: Thu, 8 Oct 2020 21:50:12 +0200 Subject: Make CI green See https://github.com/joerick/cibuildwheel/issues/446 --- .github/workflows/build-python-package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github/workflows/build-python-package.yml') diff --git a/.github/workflows/build-python-package.yml b/.github/workflows/build-python-package.yml index 45e94b853..921da9fb5 100644 --- a/.github/workflows/build-python-package.yml +++ b/.github/workflows/build-python-package.yml @@ -21,7 +21,7 @@ jobs: - name: Install cibuildwheel run: | - python -m pip install cibuildwheel==1.4.2 + python -m pip install git+https://github.com/joerick/cibuildwheel.git@master - name: Install build tools for OSX if: startsWith(matrix.os, 'macos') @@ -69,7 +69,7 @@ jobs: needs: [build_wheels, build_sdist] runs-on: ubuntu-latest if: github.ref == 'refs/heads/master' && github.event_name == 'push' - + steps: - uses: actions/checkout@v2 -- cgit v1.2.3 From 08af1356530de0d7d8dbcf095aab99911f5113ca Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Wed, 18 Nov 2020 23:08:49 +0100 Subject: Install openjdk in macOS build --- .github/workflows/build-all-versions.yml | 8 ++++---- .github/workflows/build-macos-package.yml | 5 +++-- .github/workflows/build-python-package.yml | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to '.github/workflows/build-python-package.yml') 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 -- cgit v1.2.3 From d39e4a22a8c591938170e7f66c3c1c8ea9073e15 Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Wed, 18 Nov 2020 23:24:38 +0100 Subject: Don't build binaries on push --- .github/workflows/build-debian-package.yml | 1 - .github/workflows/build-macos-package.yml | 1 - .github/workflows/build-python-package.yml | 6 +++++- .github/workflows/build-windows-package.yml | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) (limited to '.github/workflows/build-python-package.yml') diff --git a/.github/workflows/build-debian-package.yml b/.github/workflows/build-debian-package.yml index f3a937271..8248388ad 100644 --- a/.github/workflows/build-debian-package.yml +++ b/.github/workflows/build-debian-package.yml @@ -1,7 +1,6 @@ name: Build Debian Package on: - push: workflow_dispatch: jobs: diff --git a/.github/workflows/build-macos-package.yml b/.github/workflows/build-macos-package.yml index 209b31de2..384f6527d 100644 --- a/.github/workflows/build-macos-package.yml +++ b/.github/workflows/build-macos-package.yml @@ -1,7 +1,6 @@ name: Build macOS Package on: - push: workflow_dispatch: jobs: diff --git a/.github/workflows/build-python-package.yml b/.github/workflows/build-python-package.yml index fef31a785..6326821dc 100644 --- a/.github/workflows/build-python-package.yml +++ b/.github/workflows/build-python-package.yml @@ -1,6 +1,10 @@ name: Build & Publish Python Package -on: [push, pull_request] +# Trigger the workflow on push or pull request, but only for the master branch +on: + pull_request: + push: + branches: [master] jobs: build_wheels: diff --git a/.github/workflows/build-windows-package.yml b/.github/workflows/build-windows-package.yml index 0d347aedc..60647f982 100644 --- a/.github/workflows/build-windows-package.yml +++ b/.github/workflows/build-windows-package.yml @@ -1,7 +1,6 @@ name: Build Windows Package on: - push: workflow_dispatch: jobs: -- cgit v1.2.3