Skip to content

Commit a596856

Browse files
authored
Adding more testing to actions (#286)
* Adding more testing to actions * Two threads * Faster build for Azure * Fix README link
1 parent a0a22f3 commit a596856

File tree

4 files changed

+31
-11
lines changed

4 files changed

+31
-11
lines changed

.ci/azure-cmake-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ steps:
66
cmake .. -DCMAKE_BUILD_TYPE=Debug -DBOOST_HISTOGRAM_ERRORS=ON -DPYTHON_EXECUTABLE="$(which python)"
77
displayName: 'Configure'
88

9-
- script: cmake --build . -j
9+
- script: cmake --build . -j 2
1010
displayName: 'Build'
1111
workingDirectory: build
1212

.ci/azure-test-pipeline.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
- job: LinuxSDist
1313
pool:
14-
vmImage: 'ubuntu-16.04'
14+
vmImage: 'ubuntu-latest'
1515
variables:
1616
python.architecture: 'none'
1717
steps:
@@ -31,17 +31,11 @@ jobs:
3131
- job: LinuxCMake
3232
strategy:
3333
matrix:
34-
Python27:
35-
python.version: '2.7'
36-
python.architecture: 'x64'
3734
Python37:
3835
python.version: '3.7'
3936
python.architecture: 'x64'
40-
Python35:
41-
python.version: '3.5'
42-
python.architecture: 'x64'
4337
pool:
44-
vmImage: 'ubuntu-16.04'
38+
vmImage: 'ubuntu-latest'
4539
steps:
4640
- template: azure-setup.yml
4741
- template: azure-cmake-steps.yml
@@ -50,7 +44,7 @@ jobs:
5044
strategy:
5145
matrix:
5246
macOS_Python36:
53-
image: 'macOS-10.14'
47+
image: 'macOS-latest'
5448
python.version: '3.6'
5549
python.architecture: 'x64'
5650
Win_Python27_32:

.github/workflows/tests.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,29 @@ jobs:
2424
path: ~/.cache/pre-commit
2525
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
2626
- uses: pre-commit/action@v1.0.0
27+
28+
cmake:
29+
runs-on: ubuntu-latest
30+
strategy:
31+
matrix:
32+
python-version:
33+
- 2.7
34+
- 3.5
35+
- 3.8
36+
name: CMake Python ${{ matrix.python-version }}
37+
steps:
38+
- uses: actions/checkout@v1
39+
with:
40+
submodules: true
41+
- uses: actions/setup-python@v1
42+
with:
43+
python-version: ${{ matrix.python-version }}
44+
- name: Install python tools
45+
run: python -m pip install -r dev-requirements.txt
46+
- name: Configure
47+
run: mkdir -p build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Debug -DBOOST_HISTOGRAM_ERRORS=ON -DPYTHON_EXECUTABLE="$(which python)"
48+
- name: Build
49+
run: cmake --build build -j 2
50+
- name: Test
51+
working-directory: ./build
52+
run: python -m pytest

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ Support for this work was provided by the National Science Foundation cooperativ
200200
[azure-link]: https://dev.azure.com/scikit-hep/boost-histogram/_build/latest?definitionId=2&branchName=develop
201201
[rtd-badge]: https://readthedocs.org/projects/boost-histogram/badge/?version=latest
202202
[rtd-link]: https://boost-histogram.readthedocs.io/en/latest/?badge=latest
203-
[actions-badge]: https://github.com/scikit-hep/boost-histogram/workflows/Format/badge.svg
203+
[actions-badge]: https://github.com/scikit-hep/boost-histogram/workflows/Tests/badge.svg
204204
[actions-link]: https://github.com/scikit-hep/boost-histogram/actions
205205

206206
[Boost::Histogram]: https://www.boost.org/doc/libs/1_71_0/libs/histogram/doc/html/index.html

0 commit comments

Comments
 (0)