Skip to content

Commit 7feb556

Browse files
iv7777iv7777
authored
Merge branch 'master' into for-upstream
2 parents 496eaf6 + 06e258e commit 7feb556

File tree

3,582 files changed

+628784
-481198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,582 files changed

+628784
-481198
lines changed

‎.github/ISSUE_TEMPLATE/01-bug.yml‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
name: 🐛 Bug Report 🧰
2+
description: File a bug 🐛 report.
3+
title: "<package-name>: <summary>"
4+
# labels: ["bug", "triage"]
5+
# projects: ["octo-org/1", "octo-org/44"]
6+
# assignees:
7+
# - octocat
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: |
12+
Thanks for taking the time to fill out this bug report!
13+
- type: checkboxes
14+
attributes:
15+
label: Is there an existing issue for this?
16+
description: Please search to see if an issue already exists for the bug you encountered.
17+
options:
18+
- label: I have searched among all existing issues (including closed issues)
19+
required: true
20+
- type: textarea
21+
id: screenshots-or-captures
22+
attributes:
23+
label: screenshots or captures
24+
description: Screenshots or captures which illustrate the problem
25+
placeholder: |
26+
An mp4 screen capture is also possible
27+
value:
28+
validations:
29+
required: false
30+
- type: textarea
31+
id: what-happened
32+
attributes:
33+
label: Actual behaviour
34+
description: Describe what happened
35+
placeholder: |
36+
Describe what happened
37+
38+
1. option ra_mtu '1500' is set correctly in /etc/config/dhcp
39+
2. In LuCI though, RA MTU and RA Hop Limit are still displaying the default values in light gray font color.
40+
value:
41+
validations:
42+
required: true
43+
- type: textarea
44+
id: expect-to-happen
45+
attributes:
46+
label: Expected behaviour
47+
description: Describe what should happen
48+
placeholder: |
49+
Tell us what you you think should happen
50+
51+
1. option ra_mtu '1500' is set correctly in /etc/config/dhcp
52+
2. In LuCI though, RA MTU and RA Hop Limit display correctly.
53+
value:
54+
validations:
55+
required: true
56+
- type: textarea
57+
id: what-you-did
58+
attributes:
59+
label: Steps to reproduce
60+
placeholder: |
61+
1. go to: Network → Interfaces → LAN (an interface with a static address) → DHCP server tab → IPv6 RA settings tab
62+
2. set RA MTU and RA Hop Limit to arbitrary non-default value
63+
3. Save & Apply
64+
4. go to: IPv6 RA settings tab again
65+
value:
66+
validations:
67+
required: true
68+
- type: textarea
69+
id: version
70+
attributes:
71+
label: Additional Information
72+
description: |
73+
What version of openwrt/luci are you running? <br/>
74+
```
75+
ubus call system board
76+
```
77+
<br/>
78+
or copy/paste the luci and/or module version from the main status page
79+
render: shell
80+
value:
81+
placeholder: |
82+
e.g.
83+
84+
{
85+
"kernel": "5.15.167",
86+
"hostname": "openwrt",
87+
"system": "ARMv8 Processor rev 4",
88+
"model": "GL.iNet GL-MT6000",
89+
"board_name": "glinet,gl-mt6000",
90+
"rootfs_type": "squashfs",
91+
"release": {
92+
"distribution": "OpenWrt",
93+
"version": "23.05.5",
94+
"revision": "r24106-10cc5fcd00",
95+
"target": "mediatek/filogic",
96+
"description": "OpenWrt 23.05.5 r24106-10cc5fcd00"
97+
}
98+
}
99+
validations:
100+
required: true
101+
- type: dropdown
102+
id: browsers
103+
attributes:
104+
label: What browsers do you see the problem on?
105+
multiple: true
106+
options:
107+
- Firefox
108+
- Chrome
109+
- Safari
110+
- Microsoft Edge
111+
- type: textarea
112+
id: logs
113+
attributes:
114+
label: Relevant log output
115+
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.
116+
render: shell

‎.github/ISSUE_TEMPLATE/02-feature.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: 🪄 Feature request 🧙 🦄
2+
description: Ask for something nice
3+
title: "Feature request: <summary>"
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thanks for taking the time to ask for something nice!
9+
- type: textarea
10+
id: what-i-want
11+
attributes:
12+
label: What would you like to see in luci?
13+
description: feature request
14+
placeholder: Describe away
15+
value:
16+
validations:
17+
required: true

‎.github/ISSUE_TEMPLATE/03-something-else.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Something else❓
2+
description: Some other topic
3+
title: Subject
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thanks for taking the time to contact us!
9+
- type: textarea
10+
id: issue
11+
attributes:
12+
label: How can we otherwise help?
13+
placeholder: Describe away
14+
value:
15+
validations:
16+
required: true

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
blank_issues_enabled: true
2+
contact_links:
3+
- name: Our forum 💬
4+
url: https://forum.openwrt.org/
5+
about: Ask and answer questions here.
6+
- name: Our website 🌐🔗
7+
url: https://openwrt.org/
8+
about: The main website.
9+
- name: Table of hardware 💻⚙️
10+
url: https://openwrt.org/toh/start
11+
about: Find your hardware platform here.
12+
- name: JS API docs 📝♨️
13+
url: https://openwrt.github.io/luci/jsapi/

‎.github/issue_template‎

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

‎.github/pull_request_template.md‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<!--
2+
3+
Thank you for your contribution to the luci repository.
4+
5+
Please read this before creating your PR.
6+
7+
Review https://github.com/immortalwrt/luci/blob/master/CONTRIBUTING.md
8+
especially if this is your first time to contribute to this repo.
9+
10+
MUST NOT:
11+
- add a PR from your *main* branch - put it on a separate branch
12+
- add merge commits to your PR: rebase locally and force-push
13+
14+
MUST:
15+
- increment any PKG_VERSION in the affected Makefile
16+
- set to draft if this PR depends on other PRs to e.g. immortalwrt/immortalwrt
17+
- each commit subject line starts with '<package name>: title'
18+
- each commit has a valid `Signed-off-by: ` (S.O.B.) with a reachable email
19+
* Forgot? `git commit --amend ; git push -f`
20+
* Tip: use `git commit --signoff`
21+
22+
MAY:
23+
- your S.O.B. *may* be a nickname
24+
- delete the below *optional* entries that do not apply
25+
- skip a `<package name>: title` first line subject if the commit is house-keeping or chore
26+
27+
-->
28+
29+
- [ ] This PR is not from my *main* or *master* branch :poop:, but a *separate* branch :white_check_mark:
30+
- [ ] Each commit has a valid :black_nib: `Signed-off-by: <my@email.address>` row (via `git commit --signoff`)
31+
- [ ] Each commit and PR title has a valid :memo: `<package name>: title` first line subject for packages
32+
- [ ] Incremented :up: any `PKG_VERSION` in the Makefile
33+
- [ ] Tested on: (architecture, openwrt version, browser) :white_check_mark:
34+
- [ ] \( Preferred ) Mention: @ the original code author for feedback
35+
- [ ] \( Preferred ) Screenshot or mp4 of changes:
36+
- [ ] \( Optional ) Closes: e.g. openwrt/luci#issue-number
37+
- [ ] \( Optional ) Depends on: e.g. openwrt/packages#pr-number in sister repo
38+
- [ ] Description: (describe the changes proposed in this PR)

‎.github/workflows/build.yml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: Test Build
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
build:
8+
name: Test ${{ matrix.arch }}
9+
runs-on: ubuntu-latest
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
include:
14+
- arch: x86_64
15+
target: x86-64
16+
17+
steps:
18+
- uses: actions/checkout@v4
19+
with:
20+
fetch-depth: 0
21+
22+
- name: Determine branch name
23+
run: |
24+
BRANCH="${GITHUB_BASE_REF#refs/heads/}"
25+
echo "Building for $BRANCH"
26+
echo "BRANCH=$BRANCH" >> $GITHUB_ENV
27+
28+
- name: Determine changed packages
29+
run: |
30+
# only detect packages with changes
31+
PKG_ROOTS=$(find . -name Makefile | \
32+
grep -v ".*/src/Makefile" | \
33+
sed -e 's@./\(.*\)/Makefile@\1/@')
34+
CHANGES=$(git diff --diff-filter=d --name-only origin/$BRANCH)
35+
36+
for ROOT in $PKG_ROOTS; do
37+
for CHANGE in $CHANGES; do
38+
if [[ "$CHANGE" == "$ROOT"* ]]; then
39+
PACKAGES+=$(echo "$ROOT" | sed -e 's@.*/\(.*\)/@\1 @')
40+
break
41+
fi
42+
done
43+
done
44+
45+
# fallback to test packages if nothing explicitly changes this is
46+
# should run if other mechanics in packages.git changed
47+
PACKAGES="${PACKAGES:-luci-app-attendedsysupgrade}"
48+
49+
echo "Building $PACKAGES"
50+
echo "PACKAGES=$PACKAGES" >> $GITHUB_ENV
51+
52+
- name: Build
53+
uses: immortalwrt/gh-action-sdk@v6
54+
env:
55+
ARCH: ${{ matrix.arch }}-${{ env.BRANCH }}
56+
FEEDNAME: packages_ci
57+
V: s
58+
59+
- name: Move created packages to project dir
60+
run: cp bin/packages/${{ matrix.arch }}/packages_ci/* . || true
61+
62+
- name: Store packages
63+
uses: actions/upload-artifact@v4
64+
with:
65+
name: ${{ matrix.arch }}-packages
66+
path: |
67+
*.ipk
68+
*.apk
69+
70+
- name: Store logs
71+
uses: actions/upload-artifact@v4
72+
with:
73+
name: ${{ matrix.arch }}-logs
74+
path: logs/

‎.github/workflows/check_source_branch_is_not_master.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Check PR source branch
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, synchronize]
6+
7+
jobs:
8+
check-source-branch-is-not-main-or-master:
9+
runs-on: ubuntu-latest
10+
if: contains(fromJSON('["main", "master"]'), github.head_ref)
11+
# or github.event.pull_request.head.ref
12+
steps:
13+
- run: |
14+
echo "Error: Pull requests should not be from your 'main' or 'master' branch. :("
15+
exit 1

‎.github/workflows/ci_helpers.sh‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/sh
2+
3+
color_out() {
4+
printf "\e[0;$1m$PKG_NAME: %s\e[0;0m\n" "$2"
5+
}
6+
7+
success() {
8+
color_out 32 "$1"
9+
}
10+
11+
info() {
12+
color_out 36 "$1"
13+
}
14+
15+
err() {
16+
color_out 31 "$1"
17+
}
18+
19+
warn() {
20+
color_out 33 "$1"
21+
}
22+
23+
err_die() {
24+
err "$1"
25+
exit 1
26+
}

0 commit comments

Comments
 (0)