Skip to content

Commit 277e283

Browse files
committed
Merge branch 'main' into camera-streamer
2 parents 61d83b3 + b3c8a94 commit 277e283

4 files changed

Lines changed: 73 additions & 8 deletions

File tree

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: 🐛 Report a bug
2+
description: Help improve OctoPi-UpToDate by reporting observed bugs. Got a question or need support? See "Have questions or need support?" instead!
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: >
7+
8+
### ✋ **This is bug tracker, not a support forum**
9+
10+
11+
If something isn't working right, you have questions or need help, [**get in touch on the forums**](https://community.octoprint.org/c/support/).
12+
13+
14+
Only proceed here if you are 100% sure the issue you are seeing is actually a bug in OctoPi-UpToDate's build scripts. If in doubt, check
15+
in on the forums first, we can always file a bug from a support request later.
16+
- type: dropdown
17+
attributes:
18+
label: What OctoPi-UpToDate modification is involved?
19+
options:
20+
- 01-update-octoprint
21+
- 02-update-boot
22+
- 03-update-libcamera-apps
23+
- 80-install-user-fix
24+
- 81-fix-octopi-txt
25+
- 99-write-build
26+
validations:
27+
required: true
28+
- type: textarea
29+
attributes:
30+
label: The problem
31+
description: >-
32+
Describe the issue you are experiencing here. Tell us what you were trying to do
33+
step by step, and what happened that you did not expect.
34+
35+
Provide a clear and concise description of what the problem is and include as many
36+
details as possible.
37+
placeholder: |
38+
1. ...
39+
2. ...
40+
3. ...
41+
validations:
42+
required: true
43+
- type: checkboxes
44+
attributes:
45+
label: Please confirm you have understood that you can ONLY report issues with the particular OctoPi-UpToDate build scripts here, not general OctoPrint or OctoPi issues.
46+
options:
47+
- label: I confirm that my issue is **NOT** about OctoPrint.
48+
required: true
49+
- label: I confirm that my issue is **NOT** about OctoPi.
50+
required: true
51+
- label: I confirm that my issue is **ONLY** about OctoPi-UpToDate.
52+
required: true
53+
- type: textarea
54+
attributes:
55+
label: Additional information & file uploads

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: 🤔 Have questions or need support?
4+
url: https://community.octoprint.org
5+
about: Please get in touch on the OctoPrint Community Forums!
6+
- name: 💸 Want to donate?
7+
url: https://support.octoprint.org
8+
about: Please take a look at the various options to support OctoPrint's development financially!

.github/workflows/custopize.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
9696
let octopiUrl = null;
9797
for (const asset of release.releaseAssets.nodes) {
98-
if (asset.name.startsWith("octopi-") && asset.name.endsWith(".zip")) {
98+
if (asset.name.startsWith("octopi-") && asset.name.includes("-armhf-") && asset.name.endsWith(".zip")) {
9999
octopiUrl = asset.downloadUrl;
100100
break;
101101
}
@@ -161,7 +161,8 @@ jobs:
161161
* OctoPi ${{ env.OCTOPI_VERSION }}
162162
* OctoPrint ${{ env.OCTOPRINT_VERSION }}
163163
* Latest kernel & bootloader
164-
* Service to complete username changes on first-boot as needed
164+
* Latest libcamera-apps
165+
* Slight documentation changes in included config files
165166

166167
Created with [CustoPiZer](https://github.com/OctoPrint/CustoPiZer)
167168

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ A bunch of simple update scripts are run via [CustoPiZer](https://github.com/Oct
1111

1212
* `01-update-octoprint`: Updates OctoPrint to the latest version
1313
* `02-update-boot`: Updates bootloader and kernel to the latest version
14-
* `10-install-arducam-mjpg-streamer`: Replaces the existing mjpg-streamer with the Arducam fork available [here](https://github.com/ArduCAM/mjpg-streamer)
15-
* `11-install-libcamera-webcamd`: Replaces the existing webcamd script with one capable of using the new libcamera stack for RPi
14+
* `03-update-libcamera-apps`: Updates the the libcamera apps to the latest version
1615
* `80-install-user-fix`: Installs a compatibility layer to support renaming the `pi` user, if needed.
1716
* `99-write-build`: Writes the build tag to `/etc/octopiuptodate-build`
1817

@@ -21,7 +20,7 @@ A bunch of simple update scripts are run via [CustoPiZer](https://github.com/Oct
2120
There's a [Taskfile](https://taskfile.dev) in this repository that you can use to run the update scripts locally.
2221

2322
- Install [Taskfile](https://taskfile.dev/installation/)
24-
- Install [Docker]()
23+
- Install [Docker](https://www.docker.com/)
2524
- Create a `workspace` directory and place your `input.img` in that
2625
- Run `task build`
2726

@@ -33,7 +32,7 @@ docker run --rm --privileged -v $(pwd)/workspace:/CustoPiZer/workspace $(pwd)/sc
3332

3433
## Can I do something like this as well?
3534

36-
Sure, check out [CustoPiZer's README](https://github.com/OctoPrint/CustoPiZer) for
35+
Sure, check out [CustoPiZer's README](https://github.com/OctoPrint/CustoPiZer) for
3736
instructions on how to set up your own image build for modified but clean OctoPi images!
3837

3938
## Are these images available on the download page and in the Raspberry Pi Imager?
@@ -42,6 +41,8 @@ Yes, they are!
4241

4342
## I have a problem, where's the issue tracker for this project?
4443

45-
Nowhere, because this really is just a build automation.
46-
4744
If you need support with OctoPrint or OctoPi, [please get in touch on the OctoPrint Community Forums](https://community.octoprint.org).
45+
46+
For issues *specific to this project*, please [open an issue here](https://github.com/OctoPrint/OctoPi-UpToDate/issues/new?template=bug_report.yml). Please note that the only issues accepted here are those related to *modifications* done by this build process, as described above.
47+
48+
Anything not touched by the modification scripts should *not* be reported here, but rather on the [OctoPi issue tracker](https://github.com/guysoft/OctoPi/issues).

0 commit comments

Comments
 (0)