Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/peter-evans/create…
Browse files Browse the repository at this point in the history
…-pull-request-6
  • Loading branch information
trfore committed Apr 1, 2024
2 parents b47beab + 15156a3 commit 58e85bf
Show file tree
Hide file tree
Showing 9 changed files with 105 additions and 67 deletions.
3 changes: 3 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Community Code of Conduct

Please see the official [Ansible Community Code of Conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html).
42 changes: 0 additions & 42 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

49 changes: 49 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Bug Report
description: File a bug report
title: "[Bug]: "
labels: ["bug"]
assignees:
- trfore
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: textarea
id: what-happened
attributes:
label: What happened?
description: Also tell us, what did you expect to happen?
placeholder: Tell us what you see!
validations:
required: true
- type: textarea
id: yaml-playbook
attributes:
label: Relevant code or playbook
description: Please copy and paste any relevant code / playbook. This will be automatically formatted into YAML, so no need for backticks.
render: yaml
- type: textarea
id: logs
attributes:
label: Relevant log output
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
- type: textarea
id: ansible-version
attributes:
label: Ansible version
description: What version of Ansible, Molecule, and Python? (Please paste the output from `ansible --version && molecule --version && python --version`)
placeholder: "Example: ansible-core 2.10.0, python 3.8"
- type: input
id: control-node
attributes:
label: Control node OS
description: What OS is the Ansible controller running on?
placeholder: "Ubuntu 22.04"
- type: input
id: target-node
attributes:
label: Target node OS
description: What OS are you targeting in the plays?
placeholder: "CentOS 8"
18 changes: 0 additions & 18 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

35 changes: 35 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
name: Feature request
description: Suggest an idea for this project
title: "[Feature]: "
labels: ["enhancement"]
assignees:
- trfore
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to suggest new features!
- type: textarea
id: problem-statement
attributes:
label: General problem or idea
description: Is your feature request related to a problem? Please describe.
placeholder: "Example: I'm always frustrated when ..."
validations:
required: true
- type: textarea
id: solution-statement
attributes:
label: Describe the solution you'd like
description: A clear and concise description of what you want to happen.
- type: textarea
id: alternative-solutions
attributes:
label: Describe alternatives you've considered
description: A clear and concise description of any alternative solutions or features you've considered.
- type: textarea
id: additional-context
attributes:
label: Additional Context
description: Add any other context about the feature request.
4 changes: 2 additions & 2 deletions .github/workflows/update_omada.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ jobs:
TARGET="https://static.tp-link.com/upload/software/.*.gz"
latest_url=$(curl -s $URL | grep -om1 "${TARGET}")
latest_version=$(echo $latest_url | grep -o "[0-9]\.[0-9]\.[0-9][0-9]\?")
latest_version=$(echo $latest_url | grep -o "[0-9]\{1,2\}\.[0-9]\{1,2\}\.[0-9]\{1,2\}")
echo "latest_url=$latest_url" >>$GITHUB_OUTPUT
echo "latest_version=$latest_version" >>$GITHUB_OUTPUT
current_url=$(<omada.url)
current_version=$(grep -o "[0-9]\.[0-9]\.[0-9][0-9]\?" omada.url)
current_version=$(grep -o "[0-9]\{1,2\}\.[0-9]\{1,2\}\.[0-9]\{1,2\}" omada.url)
echo "current_url=$current_url" >>$GITHUB_OUTPUT
echo "current_version=$current_version" >>$GITHUB_OUTPUT
Expand Down
14 changes: 12 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,21 @@ repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: check-yaml
args: [--allow-multiple-documents]
- id: check-merge-conflict
- id: check-symlinks
- id: debug-statements
- id: end-of-file-fixer
- id: no-commit-to-branch
args: [--branch, main]
- id: trailing-whitespace
args: [--markdown-linebreak-ext=md]
- id: check-yaml
args: [--allow-multiple-documents]

- repo: https://github.com/asottile/add-trailing-comma
rev: v3.0.0
hooks:
- id: add-trailing-comma

- repo: https://github.com/adrienverge/yamllint
rev: v1.31.0
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ Taylor Fore (https://github.com/trfore)
- https://www.tp-link.com/hk/support/faq/3583/
- Omada SDN Port List
- https://www.tp-link.com/us/support/faq/865/
- Omada Controller - Site Migration
- https://www.tp-link.com/us/omada-sdn/controller-upgrade/
- https://www.tp-link.com/us/omada-sdn/controller-upgrade/#content-5_1_2

[ansible-role-jsvc]: https://github.com/trfore/ansible-role-jsvc
[trfore.jsvc]: https://galaxy.ansible.com/trfore/jsvc
Expand Down
4 changes: 1 addition & 3 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,4 @@ galaxy_info:
- name: Ubuntu
versions: [focal, jammy]

galaxy_tags:
- networking
- omada
galaxy_tags: [networking, omada]

0 comments on commit 58e85bf

Please sign in to comment.