Re-enable macOS build in CI. Minor cleanup.

This commit is contained in:
John J. Camilleri
2021-10-14 21:52:41 +02:00
parent 900a0985a8
commit d218c286eb

View File

@@ -5,13 +5,13 @@ on: push
jobs: jobs:
ubuntu-runtime: ubuntu-runtime:
name: Build on Ubuntu name: Runtime (Ubuntu)
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Build C runtime - name: Build runtime
working-directory: ./src/runtime/c working-directory: ./src/runtime/c
run: | run: |
autoreconf -i autoreconf -i
@@ -19,7 +19,8 @@ jobs:
make make
sudo make install sudo make install
- uses: actions/upload-artifact@master - name: Upload artifact
uses: actions/upload-artifact@master
with: with:
name: libpgf-ubuntu name: libpgf-ubuntu
path: | path: |
@@ -27,13 +28,14 @@ jobs:
/usr/local/include/pgf /usr/local/include/pgf
ubuntu-haskell: ubuntu-haskell:
name: Build & test Haskell bindings on Ubuntu name: Haskell (Ubuntu)
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
needs: ubuntu-runtime needs: ubuntu-runtime
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/download-artifact@master - name: Download artifact
uses: actions/download-artifact@master
with: with:
name: libpgf-ubuntu name: libpgf-ubuntu
- run: | - run: |
@@ -42,11 +44,8 @@ jobs:
- name: Setup Haskell - name: Setup Haskell
uses: haskell/actions/setup@v1 uses: haskell/actions/setup@v1
# with:
# ghc-version: '8.6'
# cabal-version: '2.4.1.0'
- name: Run Haskell testsuite - name: Build & run testsuite
working-directory: ./src/runtime/haskell working-directory: ./src/runtime/haskell
env: env:
LD_LIBRARY_PATH: /usr/local/lib LD_LIBRARY_PATH: /usr/local/lib
@@ -54,26 +53,27 @@ jobs:
cabal test --extra-lib-dirs=/usr/local/lib cabal test --extra-lib-dirs=/usr/local/lib
ubuntu-python: ubuntu-python:
name: Build & test Python bindings on Ubuntu name: Python (Ubuntu)
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
needs: ubuntu-runtime needs: ubuntu-runtime
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/download-artifact@master - name: Download artifact
uses: actions/download-artifact@master
with: with:
name: libpgf-ubuntu name: libpgf-ubuntu
- run: | - run: |
sudo mv lib/* /usr/local/lib/ sudo mv lib/* /usr/local/lib/
sudo mv include/* /usr/local/include/ sudo mv include/* /usr/local/include/
- name: Install Python bindings - name: Install bindings
working-directory: ./src/runtime/python working-directory: ./src/runtime/python
run: | run: |
python setup.py build python setup.py build
sudo python setup.py install sudo python setup.py install
- name: Run Python testsuite - name: Run testsuite
working-directory: ./src/runtime/python working-directory: ./src/runtime/python
env: env:
LD_LIBRARY_PATH: /usr/local/lib LD_LIBRARY_PATH: /usr/local/lib
@@ -82,63 +82,86 @@ jobs:
pytest pytest
ubuntu-javascript: ubuntu-javascript:
name: Build & test JavaScript bindings on Ubuntu name: JavaScript (Ubuntu)
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
needs: ubuntu-runtime needs: ubuntu-runtime
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/download-artifact@master - name: Download artifact
uses: actions/download-artifact@master
with: with:
name: libpgf-ubuntu name: libpgf-ubuntu
- run: | - run: |
sudo mv lib/* /usr/local/lib/ sudo mv lib/* /usr/local/lib/
sudo mv include/* /usr/local/include/ sudo mv include/* /usr/local/include/
- name: Build JavaScript bindings - name: Install dependencies
working-directory: ./src/runtime/javascript working-directory: ./src/runtime/javascript
run: | run: |
npm ci npm ci
- name: Run JavaScript testsuite - name: Run testsuite
working-directory: ./src/runtime/javascript working-directory: ./src/runtime/javascript
env: env:
LD_LIBRARY_PATH: /usr/local/lib LD_LIBRARY_PATH: /usr/local/lib
run: | run: |
npm run test npm run test
# macos: # ----------------------------------------------------------------------------
# name: Build on macOS
# runs-on: macOS-11 macos-runtime:
# name: Runtime (macOS)
# steps: runs-on: macOS-11
# - uses: actions/checkout@v2
# steps:
# - name: Install build tools - uses: actions/checkout@v2
# run: |
# brew install \ - name: Install build tools
# autoconf \ run: |
# automake \ brew install \
# libtool \ autoconf \
# automake \
# - name: Build C runtime libtool \
# working-directory: ./src/runtime/c
# run: | - name: Build runtime
# glibtoolize working-directory: ./src/runtime/c
# autoreconf -i run: |
# ./configure glibtoolize
# make autoreconf -i
# sudo make install ./configure
# make
# - name: Setup Haskell sudo make install
# uses: haskell/actions/setup@v1
# # with: - name: Upload artifact
# # ghc-version: '8.6' uses: actions/upload-artifact@master
# # cabal-version: '2.4.1.0' with:
# name: libpgf-macos
# - name: Run Haskell testsuite path: |
# working-directory: ./src/runtime/haskell /usr/local/lib/libpgf*
# env: /usr/local/include/pgf
# LD_LIBRARY_PATH: /usr/local/lib
# run: | macos-haskell:
# cabal test --extra-lib-dirs=/usr/local/lib name: Haskell (macOS)
runs-on: macOS-11
needs: macos-runtime
steps:
- uses: actions/checkout@v2
- name: Download artifact
uses: actions/download-artifact@master
with:
name: libpgf-macos
- run: |
sudo mv lib/* /usr/local/lib/
sudo mv include/* /usr/local/include/
- name: Setup Haskell
uses: haskell/actions/setup@v1
- name: Build & run testsuite
working-directory: ./src/runtime/haskell
env:
LD_LIBRARY_PATH: /usr/local/lib
run: |
cabal test --extra-lib-dirs=/usr/local/lib