diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 1baac22ad..ba2a9ea6b 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -22,12 +22,12 @@ jobs: if: runner.os == 'macos' run: | brew update - brew install autoconf automake pybind11 virtualenv + brew install autoconf automake - name: Setup environment (Linux) if: runner.os == 'Linux' run: | - sudo apt-get install -y --no-install-recommends build-essential pybind11-dev virtualenv python3-dev + sudo apt-get install -y --no-install-recommends build-essential #- name: Setup libfec # run: git clone https://github.com/jgaeddert/libfec.git && cd libfec && ./configure && make && sudo make install @@ -41,13 +41,6 @@ jobs: - name: make run: make -j 2 - - name: make check-doc - run: | - python3 -m venv /tmp/liquid - source /tmp/liquid/bin/activate - pip install pybind11 numpy matplotlib - make check-doc - - name: make check run: make -j 2 check @@ -60,3 +53,34 @@ jobs: - name: make check-link run: make check-link + + python: + strategy: + fail-fast: false + matrix: + runs-on: [ubuntu-latest, macos-latest] + + name: "💦 ${{ matrix.runs-on }}" + runs-on: ${{ matrix.runs-on }} + needs: standard + + steps: + - name: Setup environment (macOS) + if: runner.os == 'macos' + run: | + brew update + brew install pybind11 virtualenv + + - name: Setup environment (Linux) + if: runner.os == 'Linux' + run: | + sudo apt-get install -y --no-install-recommends pybind11-dev virtualenv python3-dev + + - name: python + run: | + python3 -m venv /tmp/liquid + source /tmp/liquid/bin/activate + pip install pybind11 numpy matplotlib + make python + make check-python + diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml deleted file mode 100644 index 232854022..000000000 --- a/.github/workflows/python.yml +++ /dev/null @@ -1,56 +0,0 @@ -name: Python CI - -on: - workflow_dispatch: - pull_request: - push: - branches: - - master - - bind-dev - - v* - -jobs: - standard: - strategy: - fail-fast: false - matrix: - runs-on: [ubuntu-latest, macos-latest] - #python: [3.8, 3.9] - - name: "💦 ${{ matrix.runs-on }}" # • 🐍 ${{ matrix.python }} - runs-on: ${{ matrix.runs-on }} - - steps: - - uses: actions/checkout@v2 - - #- name: Setup Python ${{ matrix.python }} - # uses: actions/setup-python@v2 - # with: - # python-version: ${{ matrix.python }} - - - name: Setup pybind-dev (Linux) - if: runner.os == 'Linux' - run: sudo apt-get install pybind11-dev - - - name: Setup pybind-dev (macOS) - if: runner.os == 'macOS' - run: brew install pybind11 - - - name: Setup python dependencies (pip) - run: sudo -H python3 -m pip install pybind11 numpy matplotlib - - - name: bootstrap - run: ./bootstrap.sh - - - name: configure - run: ./configure - - - name: make python - run: make -j 2 python - - - name: make check-python - run: make check-python - - - name: make check-bind - run: make -j 2 check-bind -