Skip to content

Commit 6c15675

Browse files
JarbasAlJarbasAl
authored
Merge pull request #11 from OpenVoiceOS/dev
2 parents c2c0e5b + a0ba6ca commit 6c15675

17 files changed

+151
-519
lines changed

‎.github/workflows/build_tests.yml

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,16 @@
11
name: Run Build Tests
22
on:
33
push:
4+
branches:
5+
- master
6+
pull_request:
7+
branches:
8+
- dev
49
workflow_dispatch:
510

611
jobs:
7-
build_tests:
8-
runs-on: ubuntu-latest
9-
steps:
10-
- uses: actions/checkout@v2
11-
with:
12-
ref: ${{ github.head_ref }}
13-
- name: Setup Python
14-
uses: actions/setup-python@v1
15-
with:
16-
python-version: 3.8
17-
- name: Install Build Tools
18-
run: |
19-
python -m pip install build wheel
20-
- name: Install System Dependencies
21-
run: |
22-
sudo apt-get update
23-
sudo apt install python3-dev swig libssl-dev libfann-dev portaudio19-dev libpulse-dev
24-
- name: Build Source Packages
25-
run: |
26-
python setup.py sdist
27-
- name: Build Distribution Packages
28-
run: |
29-
python setup.py bdist_wheel
30-
- name: Install tflite_runtime workaround tflit bug
31-
run: |
32-
pip3 install numpy
33-
pip3 install --extra-index-url https://google-coral.github.io/py-repo/ tflite_runtime
34-
- name: Install core repo
35-
run: |
36-
pip install .[audio-backend,mark1,stt,tts,skills_minimal,skills,gui,bus,all]
12+
py_build_tests:
13+
uses: neongeckocom/.github/.github/workflows/python_build_tests.yml@master
14+
with:
15+
test_pipaudit: true
16+
pipaudit_ignored: "GHSA-r9hx-vwmv-q579 PYSEC-2022-43012 GHSA-j8r2-6x86-q33q"

‎.github/workflows/dev2master.yml

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

‎.github/workflows/license_tests.yml

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,4 @@ on:
1010

1111
jobs:
1212
license_tests:
13-
runs-on: ubuntu-latest
14-
steps:
15-
- uses: actions/checkout@v2
16-
- name: Setup Python
17-
uses: actions/setup-python@v1
18-
with:
19-
python-version: 3.8
20-
- name: Install Build Tools
21-
run: |
22-
python -m pip install build wheel
23-
- name: Install System Dependencies
24-
run: |
25-
sudo apt-get update
26-
sudo apt install python3-dev swig libssl-dev
27-
- name: Install core repo
28-
run: |
29-
pip install .
30-
- name: Get explicit and transitive dependencies
31-
run: |
32-
pip freeze > requirements-all.txt
33-
- name: Check python
34-
id: license_check_report
35-
uses: pilosus/action-pip-license-checker@v0.5.0
36-
with:
37-
requirements: 'requirements-all.txt'
38-
fail: 'Copyleft,Other,Error'
39-
fails-only: true
40-
exclude: '^(tqdm).*'
41-
exclude-license: '^(Mozilla).*$'
42-
- name: Print report
43-
if: ${{ always() }}
44-
run: echo "${{ steps.license_check_report.outputs.report }}"
13+
uses: neongeckocom/.github/.github/workflows/license_tests.yml@master

‎.github/workflows/notify_matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ jobs:
2020
token: ${{ secrets.MATRIX_TOKEN }}
2121
channel: '!WjxEKjjINpyBRPFgxl:krbel.duckdns.org'
2222
message: |
23-
new ovos-config PR merged! https://github.com/OpenVoiceOS/ovos-config/pull/${{ github.event.number }}
23+
new ovos-messagebus PR merged! https://github.com/OpenVoiceOS/ovos-messagebus/pull/${{ github.event.number }}

‎.github/workflows/propose_release.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Propose Stable Release
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
release_type:
6+
type: choice
7+
description: Release Type
8+
options:
9+
- build
10+
- minor
11+
- major
12+
jobs:
13+
update_version:
14+
uses: neongeckocom/.github/.github/workflows/propose_semver_release.yml@master
15+
with:
16+
release_type: ${{ inputs.release_type }}
17+
version_file: ovos_messagebus/version.py
18+
alpha_var: VERSION_ALPHA
19+
build_var: VERSION_BUILD
20+
minor_var: VERSION_MINOR
21+
major_var: VERSION_MAJOR
22+
update_changelog: True
23+
branch: dev
24+
25+
pull_changes:
26+
needs: update_version
27+
uses: neongeckocom/.github/.github/workflows/pull_master.yml@master
28+
with:
29+
pr_assignee: ${{ github.actor }}
30+
pr_draft: false
31+
pr_title: ${{ needs.update_version.outputs.version }}
32+
pr_body: ${{ needs.update_version.outputs.changelog }}

‎.github/workflows/publish_alpha.yml

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# This workflow will generate a distribution and upload it to PyPI
2-
# This will always use the current `dev` branch code
32

43
name: Publish Alpha Build ...aX
54
on:
@@ -20,56 +19,48 @@ on:
2019
workflow_dispatch:
2120

2221
jobs:
22+
update_version:
23+
uses: neongeckocom/.github/.github/workflows/propose_semver_release.yml@master
24+
with:
25+
release_type: "alpha"
26+
version_file: ovos_messagebus/version.py
27+
alpha_var: VERSION_ALPHA
28+
build_var: VERSION_BUILD
29+
minor_var: VERSION_MINOR
30+
major_var: VERSION_MAJOR
31+
update_changelog: True
32+
branch: dev
2333
build_and_publish:
2434
runs-on: ubuntu-latest
35+
needs: update_version
2536
steps:
26-
- uses: actions/checkout@v2
27-
with:
28-
ref: dev
29-
fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository.
30-
- name: Setup Python
31-
uses: actions/setup-python@v1
32-
with:
33-
python-version: 3.8
34-
- name: Install Build Tools
35-
run: |
36-
python -m pip install build wheel
37-
- name: Increment Version
38-
run: |
39-
VER=$(python setup.py --version)
40-
python scripts/bump_alpha.py
41-
- name: "Generate release changelog"
42-
uses: heinrichreimer/github-changelog-generator-action@v2.3
43-
with:
44-
token: ${{ secrets.GITHUB_TOKEN }}
45-
maxIssues: 50
46-
id: changelog
47-
- name: Commit to dev
48-
uses: stefanzweifel/git-auto-commit-action@v4
49-
with:
50-
commit_message: Increment Version
51-
branch: dev
52-
- name: version
53-
run: echo "::set-output name=version::$(python setup.py --version)"
54-
id: version
5537
- name: Create Release
5638
id: create_release
5739
uses: actions/create-release@v1
5840
env:
5941
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
6042
with:
61-
tag_name: V${{ steps.version.outputs.version }}
62-
release_name: Release ${{ steps.version.outputs.version }}
43+
tag_name: V${{ needs.update_version.outputs.version }}
44+
release_name: Release ${{ needs.update_version.outputs.version }}
6345
body: |
6446
Changes in this Release
65-
${{ steps.changelog.outputs.changelog }}
47+
${{ needs.update_version.outputs.changelog }}
6648
draft: false
6749
prerelease: true
6850
commitish: dev
51+
- name: Checkout Repository
52+
uses: actions/checkout@v2
53+
with:
54+
ref: dev
55+
fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository.
6956
- name: Build Distribution Packages
7057
run: |
71-
python setup.py bdist_wheel
72-
- name: Publish to Test PyPI
73-
uses: pypa/gh-action-pypi-publish@master
58+
python setup.py sdist bdist_wheel
59+
- name: Publish to PyPI
60+
uses: pypa/gh-action-pypi-publish@release/v1
7461
with:
7562
password: ${{secrets.PYPI_TOKEN}}
63+
build_and_publish_docker:
64+
needs: build_and_publish
65+
uses: neongeckocom/.github/.github/workflows/publish_docker.yml@master
66+
secrets: inherit

‎.github/workflows/publish_build.yml

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

‎.github/workflows/publish_docker.yml

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

0 commit comments

Comments
 (0)