Skip to content

Commit

Permalink
Merge branch 'master' into reorder-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
nemesifier committed Aug 1, 2024
2 parents 1fee406 + 8a7faf9 commit 51977b9
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 15 deletions.
28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
name: Bug report
about: Open a bug report
title: "[bug] "
labels: bug
assignees: ''

---

**Describe the bug**
A clear and concise description of the bug or unexpected behavior.

**Steps To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**System Informatioon:**
- OS: [e.g. Ubuntu 24.04 LTS]
- OpenWrt Version: [e.g. OpenWrt 23.05]
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[feature] "
labels: enhancement
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
12 changes: 12 additions & 0 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: Question
about: Please use the Discussion Forum to ask questions
title: "[question] "
labels: question
assignees: ''

---

Please use the [Discussion Forum](https://github.com/orgs/openwisp/discussions) to ask questions.

We will take care of moving the discussion to a more relevant repository if needed.
20 changes: 20 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
## Checklist

- [ ] I have read the [OpenWISP Contributing Guidelines](http://openwisp.io/docs/developer/contributing.html).
- [ ] I have manually tested the changes proposed in this pull request.
- [ ] I have written new test cases for new code and/or updated existing tests for changes to existing code.
- [ ] I have updated the documentation.

## Reference to Existing Issue

Closes #<issue-number>.

Please [open a new issue](https://github.com/openwisp/openwisp-config/issues/new/choose) if there isn't an existing issue yet.

## Description of Changes

Please describe these changes.

## Screenshot

Please include any relevant screenshots.
25 changes: 16 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,27 @@ jobs:
with:
python-version: 3.7

- name: Install OpenWISP Config
run: sudo ./install-dev.sh

- name: Install Python dependencies
run: pip install openwisp-utils[qa]>=0.7
- name: Install Dependencies
id: deps
run: |
sudo ./install-dev.sh
pip install openwisp-utils[qa]>=0.7
- name: QA-Checks
run: ./run-qa-checks
env:
CI: 1

- name: Run sh-checker
if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
uses: luizm/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
sh_checker_comment: true

- name: Tests
if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
run: ./runtests

build:
Expand Down Expand Up @@ -84,13 +86,18 @@ jobs:
name: Packages
path: "${{ env.DOWNLOADS_DIR }}/${{ env.START_TIME }}"

- name: Setup Google Cloud
- name: Google Cloud Auth
if: ${{ github.event_name=='push' }}
uses: 'google-github-actions/auth@v2'
with:
project_id: ${{ secrets.GCS_PROJECT_ID }}
credentials_json: ${{ secrets.GCS_DOWNLOADS_SERVICE_ACCOUNT_JSON }}

- name: Google Cloud Setup
if: ${{ github.event_name=='push' }}
uses: google-github-actions/setup-gcloud@v0
uses: google-github-actions/setup-gcloud@v2
with:
service_account_key: ${{ secrets.GCS_DOWNLOADS_SERVICE_ACCOUNT_JSON }}
project_id: ${{ secrets.GCS_PROJECT_ID }}
export_default_credentials: true

- name: Upload compiled packages to downloads.openwisp.io
if: ${{ github.event_name=='push' }}
Expand Down
12 changes: 6 additions & 6 deletions openwisp-config/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,19 @@ endef
# for backward compatibility
define Package/openwisp-config/postinst
#!/bin/sh
if [ ! -L /usr/sbin/openwisp_config ]; then
ln -s /usr/sbin/openwisp-config /usr/sbin/openwisp_config
if [ ! -L $${IPKG_INSTROOT}/usr/sbin/openwisp_config ]; then
ln -s /usr/sbin/openwisp-config $${IPKG_INSTROOT}/usr/sbin/openwisp_config
fi

if [ ! -L /etc/init.d/openwisp_config ]; then
ln -s /etc/init.d/openwisp-config /etc/init.d/openwisp_config
if [ ! -L $${IPKG_INSTROOT}/etc/init.d/openwisp_config ]; then
ln -s /etc/init.d/openwisp-config $${IPKG_INSTROOT}/etc/init.d/openwisp_config
fi
endef

define Package/openwisp-config/postrm
#!/bin/sh
rm -f /usr/sbin/openwisp_config
rm -f /etc/init.d/openwisp_config
rm -f $${IPKG_INSTROOT}/usr/sbin/openwisp_config
rm -f $${IPKG_INSTROOT}/etc/init.d/openwisp_config
endef

$(eval $(call BuildPackage,openwisp-config))

0 comments on commit 51977b9

Please sign in to comment.