diff --git a/.github/workflows/license_tests.yml b/.github/workflows/license_tests.yml index 6e69868..7d0c4f6 100644 --- a/.github/workflows/license_tests.yml +++ b/.github/workflows/license_tests.yml @@ -1,12 +1,10 @@ -name: License tests +name: Run License Tests on: - workflow_dispatch: push: - + workflow_dispatch: + pull_request: + branches: + - master jobs: - license: - uses: openvoiceos/.github/.github/workflows/license_tests.yml@feat/shared_actions1 - with: - branch: ${{ github.head_ref }} - action_branch: feat/shared_actions1 - python_version: 3.10 + license_tests: + uses: neongeckocom/.github/.github/workflows/license_tests.yml@master diff --git a/.github/workflows/propose_release.yml b/.github/workflows/propose_release.yml index 6f3d1aa..b496de0 100644 --- a/.github/workflows/propose_release.yml +++ b/.github/workflows/propose_release.yml @@ -1,18 +1,32 @@ -name: Propose Stable Build +name: Propose Stable Release on: workflow_dispatch: inputs: release_type: type: choice + description: Release Type options: - - "patch" - - "minor" - - "major" - + - build + - minor + - major jobs: - build_and_publish: - uses: openvoiceos/.github/.github/workflows/propose_semver_release.yml@feat/shared_actions1 + update_version: + uses: neongeckocom/.github/.github/workflows/propose_semver_release.yml@master + with: + release_type: ${{ inputs.release_type }} + version_file: version.py + alpha_var: VERSION_ALPHA + build_var: VERSION_BUILD + minor_var: VERSION_MINOR + major_var: VERSION_MAJOR + update_changelog: True + branch: dev + + pull_changes: + needs: update_version + uses: neongeckocom/.github/.github/workflows/pull_master.yml@master with: - python_version: "3.10" - version_file: skill_randomness/version.py - release_type: ${{inputs.release_type}} # build, minor, major + pr_assignee: ${{ github.actor }} + pr_draft: false + pr_title: ${{ needs.update_version.outputs.version }} + pr_body: ${{ needs.update_version.outputs.changelog }} diff --git a/.github/workflows/propose_translation.yml b/.github/workflows/propose_translation.yml deleted file mode 100644 index e48e0b3..0000000 --- a/.github/workflows/propose_translation.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Propose Translations -on: - workflow_dispatch: - inputs: - translations: # wait for dispatcher input for a langcode (xx-xx) - type: string - required: true - -jobs: - propose_translation: - uses: openvoiceos/.github/.github/workflows/propose_translation.yml@feat/shared_actions1 - secrets: inherit - with: - action_branch: feat/shared_actions1 - python_version: "3.10" - language: ${{ inputs.translations }} - reviewers: "jarbasai,emphasize" diff --git a/.github/workflows/publish_alpha.yml b/.github/workflows/publish_alpha.yml index e0dfd39..8f8a79a 100644 --- a/.github/workflows/publish_alpha.yml +++ b/.github/workflows/publish_alpha.yml @@ -1,3 +1,5 @@ +# This workflow will generate a distribution and upload it to PyPI + name: Publish Alpha Build ...aX on: push: @@ -6,23 +8,26 @@ on: paths-ignore: - "version.py" - "test/**" - - "examples/**" - ".github/**" - ".gitignore" - "LICENSE" - "CHANGELOG.md" - "MANIFEST.in" + - "skill.json" - "README.md" - "scripts/**" workflow_dispatch: jobs: - build_and_publish: - uses: openvoiceos/.github/.github/workflows/publish_alpha_release.yml@feat/shared_actions1 - secrets: inherit + publish_alpha_release: + uses: neongeckocom/.github/.github/workflows/publish_alpha_release.yml@master + secrets: + PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} with: - version_file: version.py # File location of the version file, default: version.py - python_version: "3.10" - locale_folder: locale - update_intentfile: test/test_intents.yaml - changelog_file: CHANGELOG.md + version_file: "version.py" + publish_prerelease: true + update_changelog: true + alpha_var: VERSION_ALPHA + build_var: VERSION_BUILD + minor_var: VERSION_MINOR + major_var: VERSION_MAJOR diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 6c7c978..c86812b 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -1,15 +1,13 @@ +# This workflow will generate a release distribution and upload it to PyPI -name: publish_release +name: Publish Build and GitHub Release on: push: branches: - master - - main + jobs: build_and_publish_pypi_and_release: - permissions: - contents: write - packages: write uses: neongeckocom/.github/.github/workflows/publish_stable_release.yml@master secrets: PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} diff --git a/.github/workflows/skill_tests.yml b/.github/workflows/skill_tests.yml index e465c4c..bed0691 100644 --- a/.github/workflows/skill_tests.yml +++ b/.github/workflows/skill_tests.yml @@ -1,23 +1,24 @@ -name: skill_tests +# This workflow will run unit tests + +name: Test Skill on: - pull_request: {} - workflow_dispatch: {} + pull_request: + workflow_dispatch: + jobs: py_build_tests: - name: py_build_tests - permissions: - contents: read - uses: openvoiceos/.github/.github/workflows/python_build_tests.yml@feat/shared_actions1 - with: - python_matrix: '[3.9, "3.10", "3.11"]' + uses: neongeckocom/.github/.github/workflows/python_build_tests.yml@master skill_unit_tests: - name: skill_unit_tests - permissions: - contents: read - uses: openvoiceos/.github/.github/workflows/pytest_file_or_dir.yml@feat/shared_actions1 + uses: neongeckocom/.github/.github/workflows/skill_tests.yml@master + with: + neon_versions: "[3.8, 3.9, '3.10', '3.11', '3.12']" + ovos_versions: "[3.8, 3.9, '3.10', '3.11', '3.12']" + skill_intent_tests: + uses: neongeckocom/.github/.github/workflows/skill_test_intents.yml@master with: - action_branch: feat/shared_actions1 - test_location: test - python_matrix: '[3.9, "3.10", "3.11"]' - is_skill: true - upload_coverage: true + test_padacioso: false + test_padatious: true + neon_versions: "[3.8, 3.9, '3.10', '3.11', '3.12']" + ovos_versions: "[3.8, 3.9, '3.10', '3.11', '3.12']" + skill_resource_tests: + uses: neongeckocom/.github/.github/workflows/skill_test_resources.yml@master diff --git a/.github/workflows/test_resources.yml b/.github/workflows/test_resources.yml deleted file mode 100644 index 17c870a..0000000 --- a/.github/workflows/test_resources.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Test Resources -on: - workflow_dispatch: - push: - -jobs: - test-intents: - uses: openvoiceos/.github/.github/workflows/skill_test_resources.yml@feat/shared_actions1 - with: - action_branch: feat/shared_actions1 - python_matrix: '[3.9, "3.10", "3.11"]' - intent_testfile: test/test_resources.yaml diff --git a/.github/workflows/update_skill_json.yml b/.github/workflows/update_skill_json.yml index 5ec0f35..dc580bb 100644 --- a/.github/workflows/update_skill_json.yml +++ b/.github/workflows/update_skill_json.yml @@ -1,4 +1,3 @@ - name: update_skill_json on: push: {} diff --git a/skill.json b/skill.json index 4f4bfb7..d9ed58b 100644 --- a/skill.json +++ b/skill.json @@ -1,6 +1,6 @@ { "title": "Laugh", - "url": "https://github.com/OpenVoiceOS/ovos-skill-laugh", + "url": "https://github.com/mikejgray/skill-laugh", "summary": "![Python](https://img.shields.io/badge/python-3.8-blue.svg) ![Python](https://img.shields.io/badge/python-3.9-blue.svg) ![Python](https://img.shields.io/badge/python-3.10-blue.svg) ![Python](https://img.shields.io/badge/python-3.11-blue.svg) Makes your voice assistant laugh like a maniac ![A ghostly face, laughing evilly.](./sshot.png)", "short_description": "![Python](https://img.shields.io/badge/python-3.8-blue.svg) ![Python](https://img.shields.io/badge/python-3.9-blue.svg) ![Python](https://img.shields.io/badge/python-3.10-blue.svg) ![Python](https://img.shields.io/badge/python-3.11-blue.svg) Makes your voice assistant laugh like a maniac ![A ghostly face, laughing evilly.](./sshot.png)", "description": "Laugh randomly or when requested.", @@ -48,8 +48,8 @@ "- [SoundBible](http://soundbible.com/suggest.php?q=laugh&x=0&y=0)", "- [FreeSound](https://freesound.org/search/?q=female+evil+laugh)" ], - "skillname": "ovos-skill-laugh", - "authorname": "OpenVoiceOS", + "skillname": "skill-laugh", + "authorname": "mikejgray", "foldername": null, "settings": "~/.config/ovos/skills/skill-laugh.openvoiceos/settings.json ~/.config/neon/skills/skill-laugh.openvoiceos/settings.json ```json { \"gender\": \"robot\", // or \"male\" or \"female\" \"haunted\": false, // default true, \"mine is an evil laugh\" \"sounds_dir\": \"/home/neon/venv/lib/python3.10/site-packages/skill_laugh/sounds\", // default on a Neon setup, can be set to anything OVOS/Neon can access \"__mycroft_skill_firstrun\": false } ```" } \ No newline at end of file