Skip to content

Commit

Permalink
Merge branch 'master' into for-upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
iv7777 authored Jan 15, 2025
2 parents 496eaf6 + 06e258e commit 7feb556
Show file tree
Hide file tree
Showing 3,582 changed files with 628,784 additions and 481,198 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
116 changes: 116 additions & 0 deletions .github/ISSUE_TEMPLATE/01-bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
name: 🐛 Bug Report 🧰
description: File a bug 🐛 report.
title: "<package-name>: <summary>"
# labels: ["bug", "triage"]
# projects: ["octo-org/1", "octo-org/44"]
# assignees:
# - octocat
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: checkboxes
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched among all existing issues (including closed issues)
required: true
- type: textarea
id: screenshots-or-captures
attributes:
label: screenshots or captures
description: Screenshots or captures which illustrate the problem
placeholder: |
An mp4 screen capture is also possible
value:
validations:
required: false
- type: textarea
id: what-happened
attributes:
label: Actual behaviour
description: Describe what happened
placeholder: |
Describe what happened
1. option ra_mtu '1500' is set correctly in /etc/config/dhcp
2. In LuCI though, RA MTU and RA Hop Limit are still displaying the default values in light gray font color.
value:
validations:
required: true
- type: textarea
id: expect-to-happen
attributes:
label: Expected behaviour
description: Describe what should happen
placeholder: |
Tell us what you you think should happen
1. option ra_mtu '1500' is set correctly in /etc/config/dhcp
2. In LuCI though, RA MTU and RA Hop Limit display correctly.
value:
validations:
required: true
- type: textarea
id: what-you-did
attributes:
label: Steps to reproduce
placeholder: |
1. go to: Network → Interfaces → LAN (an interface with a static address) → DHCP server tab → IPv6 RA settings tab
2. set RA MTU and RA Hop Limit to arbitrary non-default value
3. Save & Apply
4. go to: IPv6 RA settings tab again
value:
validations:
required: true
- type: textarea
id: version
attributes:
label: Additional Information
description: |
What version of openwrt/luci are you running? <br/>
```
ubus call system board
```
<br/>
or copy/paste the luci and/or module version from the main status page
render: shell
value:
placeholder: |
e.g.
{
"kernel": "5.15.167",
"hostname": "openwrt",
"system": "ARMv8 Processor rev 4",
"model": "GL.iNet GL-MT6000",
"board_name": "glinet,gl-mt6000",
"rootfs_type": "squashfs",
"release": {
"distribution": "OpenWrt",
"version": "23.05.5",
"revision": "r24106-10cc5fcd00",
"target": "mediatek/filogic",
"description": "OpenWrt 23.05.5 r24106-10cc5fcd00"
}
}
validations:
required: true
- type: dropdown
id: browsers
attributes:
label: What browsers do you see the problem on?
multiple: true
options:
- Firefox
- Chrome
- Safari
- Microsoft Edge
- type: textarea
id: logs
attributes:
label: Relevant log output
description: Please copy and paste any relevant log output from your browser (web developer tools) console. This will be automatically formatted into code, so no need for backticks.
render: shell
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/02-feature.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: 🪄 Feature request 🧙 🦄
description: Ask for something nice
title: "Feature request: <summary>"
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to ask for something nice!
- type: textarea
id: what-i-want
attributes:
label: What would you like to see in luci?
description: feature request
placeholder: Describe away
value:
validations:
required: true
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/03-something-else.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Something else❓
description: Some other topic
title: Subject
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to contact us!
- type: textarea
id: issue
attributes:
label: How can we otherwise help?
placeholder: Describe away
value:
validations:
required: true
13 changes: 13 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
blank_issues_enabled: true
contact_links:
- name: Our forum 💬
url: https://forum.openwrt.org/
about: Ask and answer questions here.
- name: Our website 🌐🔗
url: https://openwrt.org/
about: The main website.
- name: Table of hardware 💻⚙️
url: https://openwrt.org/toh/start
about: Find your hardware platform here.
- name: JS API docs 📝♨️
url: https://openwrt.github.io/luci/jsapi/
40 changes: 0 additions & 40 deletions .github/issue_template

This file was deleted.

38 changes: 38 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<!--
Thank you for your contribution to the luci repository.
Please read this before creating your PR.
Review https://github.com/immortalwrt/luci/blob/master/CONTRIBUTING.md
especially if this is your first time to contribute to this repo.
MUST NOT:
- add a PR from your *main* branch - put it on a separate branch
- add merge commits to your PR: rebase locally and force-push
MUST:
- increment any PKG_VERSION in the affected Makefile
- set to draft if this PR depends on other PRs to e.g. immortalwrt/immortalwrt
- each commit subject line starts with '<package name>: title'
- each commit has a valid `Signed-off-by: ` (S.O.B.) with a reachable email
* Forgot? `git commit --amend ; git push -f`
* Tip: use `git commit --signoff`
MAY:
- your S.O.B. *may* be a nickname
- delete the below *optional* entries that do not apply
- skip a `<package name>: title` first line subject if the commit is house-keeping or chore
-->

- [ ] This PR is not from my *main* or *master* branch :poop:, but a *separate* branch :white_check_mark:
- [ ] Each commit has a valid :black_nib: `Signed-off-by: <[email protected]>` row (via `git commit --signoff`)
- [ ] Each commit and PR title has a valid :memo: `<package name>: title` first line subject for packages
- [ ] Incremented :up: any `PKG_VERSION` in the Makefile
- [ ] Tested on: (architecture, openwrt version, browser) :white_check_mark:
- [ ] \( Preferred ) Mention: @ the original code author for feedback
- [ ] \( Preferred ) Screenshot or mp4 of changes:
- [ ] \( Optional ) Closes: e.g. openwrt/luci#issue-number
- [ ] \( Optional ) Depends on: e.g. openwrt/packages#pr-number in sister repo
- [ ] Description: (describe the changes proposed in this PR)
74 changes: 74 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: Test Build

on:
pull_request:

jobs:
build:
name: Test ${{ matrix.arch }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include:
- arch: x86_64
target: x86-64

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Determine branch name
run: |
BRANCH="${GITHUB_BASE_REF#refs/heads/}"
echo "Building for $BRANCH"
echo "BRANCH=$BRANCH" >> $GITHUB_ENV
- name: Determine changed packages
run: |
# only detect packages with changes
PKG_ROOTS=$(find . -name Makefile | \
grep -v ".*/src/Makefile" | \
sed -e 's@./\(.*\)/Makefile@\1/@')
CHANGES=$(git diff --diff-filter=d --name-only origin/$BRANCH)
for ROOT in $PKG_ROOTS; do
for CHANGE in $CHANGES; do
if [[ "$CHANGE" == "$ROOT"* ]]; then
PACKAGES+=$(echo "$ROOT" | sed -e 's@.*/\(.*\)/@\1 @')
break
fi
done
done
# fallback to test packages if nothing explicitly changes this is
# should run if other mechanics in packages.git changed
PACKAGES="${PACKAGES:-luci-app-attendedsysupgrade}"
echo "Building $PACKAGES"
echo "PACKAGES=$PACKAGES" >> $GITHUB_ENV
- name: Build
uses: immortalwrt/gh-action-sdk@v6
env:
ARCH: ${{ matrix.arch }}-${{ env.BRANCH }}
FEEDNAME: packages_ci
V: s

- name: Move created packages to project dir
run: cp bin/packages/${{ matrix.arch }}/packages_ci/* . || true

- name: Store packages
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.arch }}-packages
path: |
*.ipk
*.apk
- name: Store logs
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.arch }}-logs
path: logs/
15 changes: 15 additions & 0 deletions .github/workflows/check_source_branch_is_not_master.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Check PR source branch

on:
pull_request_target:
types: [opened, synchronize]

jobs:
check-source-branch-is-not-main-or-master:
runs-on: ubuntu-latest
if: contains(fromJSON('["main", "master"]'), github.head_ref)
# or github.event.pull_request.head.ref
steps:
- run: |
echo "Error: Pull requests should not be from your 'main' or 'master' branch. :("
exit 1
26 changes: 26 additions & 0 deletions .github/workflows/ci_helpers.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/bin/sh

color_out() {
printf "\e[0;$1m$PKG_NAME: %s\e[0;0m\n" "$2"
}

success() {
color_out 32 "$1"
}

info() {
color_out 36 "$1"
}

err() {
color_out 31 "$1"
}

warn() {
color_out 33 "$1"
}

err_die() {
err "$1"
exit 1
}
Loading

0 comments on commit 7feb556

Please sign in to comment.