Skip to content

Commit d5ebab4

Browse files
committed
fix merge clash
2 parents b5bf9d1 + 83c648c commit d5ebab4

File tree

16 files changed

+398
-408
lines changed

16 files changed

+398
-408
lines changed

.github/build-wheels.sh

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/cibuildwheel.yml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: Build all Wheels
2+
3+
on:
4+
release:
5+
types: [created]
6+
workflow_dispatch:
7+
8+
jobs:
9+
build_wheels:
10+
name: Build wheels on ${{ matrix.os }}
11+
runs-on: ${{ matrix.os }}
12+
13+
strategy:
14+
matrix:
15+
os: [ubuntu-20.04, windows-2019, macos-11]
16+
include:
17+
- os: ubuntu-20.04
18+
cibw_archs: "aarch64"
19+
20+
steps:
21+
22+
# Set up emulation for arm on linux
23+
- name: Set up QEMU
24+
if: matrix.cibw_archs == 'aarch64'
25+
uses: docker/setup-qemu-action@v2
26+
with:
27+
platforms: arm64
28+
- uses: actions/checkout@v3
29+
30+
- name: Build wheels
31+
uses: pypa/cibuildwheel@v2.11.3
32+
33+
- uses: actions/upload-artifact@v3
34+
with:
35+
path: ./wheelhouse/*.whl
36+
37+
build_sdist:
38+
name: Build source distribution
39+
runs-on: ubuntu-latest
40+
steps:
41+
- uses: actions/checkout@v3
42+
43+
- name: Build sdist
44+
run: pipx run build --sdist
45+
46+
- uses: actions/upload-artifact@v3
47+
with:
48+
path: dist/*.tar.gz
49+
50+
upload_pypi:
51+
needs: [build_wheels, build_sdist]
52+
runs-on: ubuntu-latest
53+
steps:
54+
- uses: actions/download-artifact@v3
55+
with:
56+
# unpacks default artifact into dist/
57+
name: artifact
58+
path: dist
59+
60+
- uses: pypa/gh-action-pypi-publish@v1.5.0
61+
with:
62+
user: __token__
63+
password: ${{ secrets.PYPI_PASSWORD }}
64+
65+

.github/workflows/python-publish.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/workflows/python_publish_linux.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

.github/workflows/pythonpackage.yml renamed to .github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
22
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
33

4-
name: build
4+
name: Test
55

66
on:
77
push:
@@ -49,7 +49,7 @@ jobs:
4949
pytest --cov=roboticstoolbox --cov-report xml:coverage.xml
5050
coverage report
5151
- name: upload coverage to Codecov
52-
uses: codecov/codecov-action@master
52+
uses: codecov/codecov-action@v3
5353
with:
5454
file: ./coverage.xml
5555
sphinx:

.github/workflows/future_testing.yml renamed to .github/workflows/test_future.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: build
1+
name: Test - Future
22

33
on:
44
push:

.github/workflows/upload_tar.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)