Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/4.x' into separate_cmd_input
Browse files Browse the repository at this point in the history
  • Loading branch information
Quentin Peter committed Apr 19, 2020
2 parents 385149a + 0798ff6 commit 238eaff
Show file tree
Hide file tree
Showing 11 changed files with 228 additions and 104 deletions.
20 changes: 0 additions & 20 deletions .github/scripts/check_skip_py.sh
View file

This file was deleted.

58 changes: 41 additions & 17 deletions .github/workflows/test-files.yml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,33 @@
name: File tests

on:
# This avoids having duplicate builds for a pull request
push:
branches:
- master
- 5.x
- 4.x
- master
- 5.x
- 4.x
paths:
- '.github/scripts/*.sh'
- '.github/workflows/*.yml'
- 'requirements/*.txt'
- 'MANIFEST.in'
- '**.bat'
- '**.py'
- '**.sh'

pull_request:
branches:
- master
- 5.x
- 4.x
- master
- 5.x
- 4.x
paths:
- '.github/scripts/*.sh'
- '.github/workflows/*.yml'
- 'requirements/*.txt'
- 'MANIFEST.in'
- '**.bat'
- '**.py'
- '**.sh'

jobs:
cleanup-previous-runs:
Expand All @@ -37,47 +53,55 @@ jobs:
matrix:
PYTHON_VERSION: ['3.7', '3.6', '2.7']
steps:
- name: Checkout
- name: Checkout Pull Requests
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Checkout Push
if: github.event_name != 'pull_request'
uses: actions/checkout@v2
- name: Fetch branches
if: github.event_name == 'pull_request'
run: git fetch --prune --unshallow
- name: Check build skips
if: github.event_name == 'pull_request'
shell: bash -l {0}
run: |
source .github/scripts/check_skip.sh
source .github/scripts/check_skip_py.sh
run: source .github/scripts/check_skip.sh
- name: Check build runs
if: github.event_name != 'pull_request'
shell: bash -l {0}
run: echo "::set-env name=RUN_BUILD::true"
- name: Install dependencies
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
shell: bash
run: sudo apt-get install libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libegl1-mesa libxkbcommon-x11-0
- name: Cache pip
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }}
restore-keys: ${{ runner.os }}-pip-
- name: Install Conda
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
uses: goanpeca/setup-miniconda@v1
with:
activate-environment: test
auto-update-conda: true
auto-activate-base: false
python-version: ${{ matrix.PYTHON_VERSION }}
- name: Create test environment
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
shell: bash -l {0}
run: bash -l .github/scripts/install.sh
- name: Show test environment
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
shell: bash -l {0}
run: |
conda info
conda list
- name: Run file tests
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
shell: bash -l {0}
run: xvfb-run --auto-servernum .github/scripts/modules_test.sh || xvfb-run --auto-servernum .github/scripts/modules_test.sh
62 changes: 43 additions & 19 deletions .github/workflows/test-linux.yml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,33 @@
name: Linux tests

on:
# This avoids having duplicate builds for a pull request
push:
branches:
- master
- 5.x
- 4.x
- master
- 5.x
- 4.x
paths:
- '.github/scripts/*.sh'
- '.github/workflows/*.yml'
- 'requirements/*.txt'
- 'MANIFEST.in'
- '**.bat'
- '**.py'
- '**.sh'

pull_request:
branches:
- master
- 5.x
- 4.x
- master
- 5.x
- 4.x
paths:
- '.github/scripts/*.sh'
- '.github/workflows/*.yml'
- 'requirements/*.txt'
- 'MANIFEST.in'
- '**.bat'
- '**.py'
- '**.sh'

jobs:
cleanup-previous-runs:
Expand Down Expand Up @@ -48,55 +64,63 @@ jobs:
PYTHON_VERSION: '2.7'
TEST_TYPE: 'slow'
steps:
- name: Checkout
- name: Checkout Pull Requests
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Checkout Push
if: github.event_name != 'pull_request'
uses: actions/checkout@v2
- name: Fetch branches
if: github.event_name == 'pull_request'
run: git fetch --prune --unshallow
- name: Check build skips
if: github.event_name == 'pull_request'
shell: bash -l {0}
run: |
source .github/scripts/check_skip.sh
source .github/scripts/check_skip_py.sh
run: source .github/scripts/check_skip.sh
- name: Check build runs
if: github.event_name != 'pull_request'
shell: bash -l {0}
run: echo "::set-env name=RUN_BUILD::true"
- name: Install dependencies
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
shell: bash
run: sudo apt-get install libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libegl1-mesa libxkbcommon-x11-0
- name: Cache pip
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }}
restore-keys: ${{ runner.os }}-pip-
- name: Install Conda
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
uses: goanpeca/setup-miniconda@v1
with:
activate-environment: test
auto-update-conda: true
auto-activate-base: false
python-version: ${{ matrix.PYTHON_VERSION }}
- name: Create test environment
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
shell: bash -l {0}
run: bash -l .github/scripts/install.sh
- name: Show test environment
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
shell: bash -l {0}
run: |
conda info
conda list
- name: Run manifest checks
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
shell: bash -l {0}
run: check-manifest
- name: Run tests
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
shell: bash -l {0}
run: xvfb-run --auto-servernum python runtests.py || xvfb-run --auto-servernum python runtests.py
- name: Coverage
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
shell: bash -l {0}
run: codecov
58 changes: 41 additions & 17 deletions .github/workflows/test-mac.yml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,33 @@
name: Mac tests

on:
# This avoids having duplicate builds for a pull request
push:
branches:
- master
- 5.x
- 4.x
- master
- 5.x
- 4.x
paths:
- '.github/scripts/*.sh'
- '.github/workflows/*.yml'
- 'requirements/*.txt'
- 'MANIFEST.in'
- '**.bat'
- '**.py'
- '**.sh'

pull_request:
branches:
- master
- 5.x
- 4.x
- master
- 5.x
- 4.x
paths:
- '.github/scripts/*.sh'
- '.github/workflows/*.yml'
- 'requirements/*.txt'
- 'MANIFEST.in'
- '**.bat'
- '**.py'
- '**.sh'

jobs:
cleanup-previous-runs:
Expand Down Expand Up @@ -41,43 +57,51 @@ jobs:
PYTHON_VERSION: ['3.7', '2.7']
TEST_TYPE: ['fast', 'slow']
steps:
- name: Checkout
- name: Checkout Pull Requests
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Checkout Push
if: github.event_name != 'pull_request'
uses: actions/checkout@v2
- name: Fetch branches
if: github.event_name == 'pull_request'
run: git fetch --prune --unshallow
- name: Check build skips
if: github.event_name == 'pull_request'
shell: bash -l {0}
run: |
source .github/scripts/check_skip.sh
source .github/scripts/check_skip_py.sh
run: source .github/scripts/check_skip.sh
- name: Check build runs
if: github.event_name != 'pull_request'
shell: bash -l {0}
run: echo "::set-env name=RUN_BUILD::true"
- name: Install Conda
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
uses: goanpeca/setup-miniconda@v1
with:
activate-environment: test
auto-update-conda: true
python-version: ${{ matrix.PYTHON_VERSION }}
- name: Create test environment
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
shell: bash -l {0}
run: bash -l .github/scripts/install.sh
- name: Show test environment
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
shell: bash -l {0}
run: |
conda info
conda list
- name: Run manifest checks
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
shell: bash -l {0}
run: check-manifest
- name: Run tests
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
shell: bash -l {0}
run: python runtests.py || python runtests.py || python runtests.py || python runtests.py || python runtests.py
- name: Coverage
if: env.RUN_BUILD == 'true' && env.RUN_BUILD_PY == 'true'
if: env.RUN_BUILD == 'true'
shell: bash -l {0}
run: codecov

0 comments on commit 238eaff

Please sign in to comment.