"libraries/lepton/src/CompiledVectorExpression.cpp" did not exist on "8b3bfc92cb8bb04ce01c9abbdc8a1600c74e33af"
Commit 6be23d1e authored by Andrew Murray's avatar Andrew Murray
Browse files

Merge branch 'devel' into pypy

parents d02bed6e 678d8451
...@@ -7,24 +7,24 @@ environment: ...@@ -7,24 +7,24 @@ environment:
TEST_DEPENDS: "nose" TEST_DEPENDS: "nose"
matrix: matrix:
- PYTHON: "C:\\Miniconda" #- PYTHON: "C:\\Miniconda"
PYTHON_VERSION: "2.7" # PYTHON_VERSION: "2.7"
PYTHON_ARCH: "32" # PYTHON_ARCH: "32"
- PYTHON: "C:\\Miniconda-x64" #- PYTHON: "C:\\Miniconda-x64"
PYTHON_VERSION: "2.7" # PYTHON_VERSION: "2.7"
PYTHON_ARCH: "64" # PYTHON_ARCH: "64"
- PYTHON: "C:\\Miniconda35" #- PYTHON: "C:\\Miniconda35"
PYTHON_VERSION: "3.5" # PYTHON_VERSION: "3.5"
PYTHON_ARCH: "32" # PYTHON_ARCH: "32"
- PYTHON: "C:\\Miniconda35-x64" #- PYTHON: "C:\\Miniconda35-x64"
PYTHON_VERSION: "3.5" # PYTHON_VERSION: "3.5"
PYTHON_ARCH: "64" # PYTHON_ARCH: "64"
- PYTHON: "C:\\Miniconda36" #- PYTHON: "C:\\Miniconda36"
PYTHON_VERSION: "3.6" # PYTHON_VERSION: "3.6"
PYTHON_ARCH: "32" # PYTHON_ARCH: "32"
- PYTHON: "C:\\Miniconda36-x64" #- PYTHON: "C:\\Miniconda36-x64"
PYTHON_VERSION: "3.6" # PYTHON_VERSION: "3.6"
PYTHON_ARCH: "64" # PYTHON_ARCH: "64"
- PYTHON: "C:\\Miniconda37" - PYTHON: "C:\\Miniconda37"
PYTHON_VERSION: "3.7" PYTHON_VERSION: "3.7"
PYTHON_ARCH: "32" PYTHON_ARCH: "32"
...@@ -38,7 +38,7 @@ platform: ...@@ -38,7 +38,7 @@ platform:
- x64 - x64
matrix: matrix:
fast_finish: true fast_finish: false
install: install:
# Install miniconda and fix headers # Install miniconda and fix headers
...@@ -85,7 +85,11 @@ test_script: ...@@ -85,7 +85,11 @@ test_script:
- ps: .\install_python.ps1 - ps: .\install_python.ps1
- set PYTHON=C:\Python38 - set PYTHON=C:\Python38
- ps: .\install_python.ps1 - ps: .\install_python.ps1
- set PYTHON=C:\Python39rc1-x64 - set PYTHON=C:\Python39-x64
- ps: .\install_python.ps1
- set PYTHON=C:\Python39
- ps: .\install_python.ps1
- set PYTHON=C:\Python310-x64
- ps: .\install_python.ps1 - ps: .\install_python.ps1
- set PYTHON=C:\Python39rc1 - set PYTHON=C:\Python310
- ps: .\install_python.ps1 - ps: .\install_python.ps1
# This is a basic workflow to help you get started with Actions
name: Test
# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the devel branch
push:
branches: [ devel ]
pull_request:
branches: [ devel ]
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest] # [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.10"] # ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11", "pypy3"]
# The type of runner that the job will run on
runs-on: ${{ matrix.os }}
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
# Runs a single command using the runner's Python
- name: Run a one-line script
shell: python
run: print("Hello, world!")
# Runs a set of commands using the runner's shell
- name: Run a multi-line script
run: |
echo Add other actions to build,
echo test, and deploy your project.
...@@ -27,7 +27,6 @@ fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/2.7.4/harfbu ...@@ -27,7 +27,6 @@ fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/2.7.4/harfbu
suppress build_bzip2 suppress build_bzip2
suppress build_openssl suppress build_openssl
suppress build_libpng suppress build_libpng
suppress build_libwebp
suppress build_szip suppress build_szip
suppress build_swig suppress build_swig
# We need to find a failable test for build_github # We need to find a failable test for build_github
...@@ -43,9 +42,10 @@ suppress build_flex ...@@ -43,9 +42,10 @@ suppress build_flex
if [[ $MB_ML_VER != "_2_24" ]]; then if [[ $MB_ML_VER != "_2_24" ]]; then
suppress build_openblas suppress build_openblas
fi fi
suppress ensure_xz
suppress build_tiff suppress build_tiff
suppress build_libwebp
suppress build_lcms2 suppress build_lcms2
suppress ensure_xz
suppress build_freetype suppress build_freetype
suppress build_libyaml suppress build_libyaml
if [ -z "$IS_MACOS" ]; then if [ -z "$IS_MACOS" ]; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment