diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 98f674f5..c68df47e 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -21,10 +21,10 @@ env: jobs: build-linux: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: matrix: - python-version: [3.8.14] + python-version: [ 3.9.13 ] env: MESHROOM_NODES_PATH: '${{ github.workspace }}/../meshroomNodes/meshroom/nodes' @@ -53,3 +53,37 @@ jobs: - name: Test with pytest run: | pytest tests/ + + build-windows: + runs-on: windows-latest + strategy: + matrix: + python-version: [ 3.9.13 ] + env: + MESHROOM_NODES_PATH: '${{ github.workspace }}/../meshroomNodes/meshroom/nodes' + + steps: + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Clone meshroomNodes + run: | + cd .. + git clone https://github.com/alicevision/meshroomNodes.git + cd ${{ github.workspace }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install flake8 pytest + pip install -r requirements.txt -r dev_requirements.txt --timeout 45 + - name: Lint with flake8 + run: | + # stop the build if there are Python syntax errors or undefined names + flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics + # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide + flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + - name: Test with pytest + run: | + pytest tests/ \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 745669ea..00000000 --- a/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -language: python -dist: bionic - -python: - - "3.6" - - "3.7" - - "3.8" - -install: - - "pip install -r requirements.txt -r dev_requirements.txt --timeout 45" - - pip install flake8 - -before_script: - # stop the build if there are Python syntax errors or undefined names - - flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics - # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide - - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - -script: - - "pytest tests/" - -after_success: -- "python setup.py build" diff --git a/README.md b/README.md index 1494a360..870dbda7 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,7 @@ Learn more details about the pipeline on [AliceVision website](http://alicevisio See [results of the pipeline on sketchfab](http://sketchfab.com/AliceVision). -Continuous integration: -* Windows: [![Build status](https://ci.appveyor.com/api/projects/status/25sd7lfr3v0rnvni/branch/develop?svg=true)](https://ci.appveyor.com/project/AliceVision/meshroom/branch/develop) -* Linux: [![Build Status](https://travis-ci.org/alicevision/meshroom.svg?branch=develop)](https://travis-ci.org/alicevision/meshroom) +Continuous integration: [![Build status](https://github.com/alicevision/Meshroom/actions/workflows/continuous-integration.yml/badge.svg?branch=develop)](https://github.com/alicevision/Meshroom/actions/workflows/continuous-integration.yml) ## Photogrammetry diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 1a855568..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,21 +0,0 @@ -image: Visual Studio 2019 -environment: - PYTHON: "C:\\Python38-x64" - -install: - - "set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - - "pip install -r requirements.txt -r dev_requirements.txt --timeout 45" - - "cd .. && git clone https://github.com/alicevision/meshroomNodes && cd Meshroom" - - "set MESHROOM_NODES_PATH=%MESHROOM_NODES_PATH%;%cd%/../meshroomNodes/meshroom/nodes" - -build: off - -test_script: - - "pytest tests/" - -after_test: - - "python setup.py build" - - 7z a meshroomWin64snapshot%APPVEYOR_PULL_REQUEST_HEAD_COMMIT%.zip ./build/* - -artifacts: - - path: meshroomWin64*.zip