Skip to content

Commit 317c0c1

Browse files
committed
Merge branch 'main' into camera-streamer
2 parents 11b47eb + 2e362fa commit 317c0c1

File tree

6 files changed

+59
-3
lines changed

6 files changed

+59
-3
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ body:
2323
- 10-install-camera-streamer
2424
- 80-install-user-fix
2525
- 81-fix-octopi-txt
26+
- 82-fix-welcome-banner
2627
- 99-write-build
2728
validations:
2829
required: true
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: "🧑‍💻 Internal: Dev Bug"
2+
description: Only use this issue type if you are a maintainer or collaborator of OctoPi-UpToDate!
3+
labels: ["bug"]
4+
body:
5+
- type: textarea
6+
attributes:
7+
label: The problem
8+
placeholder: |
9+
1. ...
10+
2. ...
11+
3. ...
12+
validations:
13+
required: true
14+
- type: textarea
15+
attributes:
16+
label: Proposed solution
17+
validations:
18+
required: true
19+
- type: textarea
20+
attributes:
21+
label: Additional information
22+
- type: checkboxes
23+
attributes:
24+
label: Verification
25+
options:
26+
- label: I'm a maintainer or collaborator of OctoPi-UpToDate and allowed to use this issue type
27+
required: true
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: "🧑‍💻 Internal: Dev Task"
2+
description: Only use this issue type if you are a maintainer or collaborator of OctoPi-UpToDate!
3+
title: "[Task] "
4+
labels: ["task"]
5+
body:
6+
- type: textarea
7+
attributes:
8+
label: "The task"
9+
validations:
10+
required: true
11+
- type: checkboxes
12+
attributes:
13+
label: Verification
14+
options:
15+
- label: I'm a maintainer or collaborator of OctoPi-UpToDate and allowed to use this issue type
16+
required: true

.github/workflows/custopize.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,10 @@ jobs:
246246
image_size: ${{ steps.package-image.outputs.image_size }}
247247
zip_sha256: ${{ steps.package-image.outputs.zip_sha256 }}
248248
zip_size: ${{ steps.package-image.outputs.zip_size }}
249-
devices: "pi4-32bit,pi3-32bit,pi2-32bit,pi1-32bit"
249+
devices: "pi5-32bit,pi4-32bit,pi3-32bit,pi2-32bit,pi1-32bit"
250250

251251
- name: "🔖 Create release & attach assets"
252-
uses: softprops/action-gh-release@v2
252+
uses: softprops/action-gh-release@v2.2.2 # 2025-06-10: v2 is currently broken
253253
with:
254254
name: "${{ env.RELEASE_NAME }}"
255255
tag_name: "${{ env.RELEASE_TAG }}"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ There's a [Taskfile](https://taskfile.dev) in this repository that you can use t
3131
Alternatively, you can also manually run `docker`:
3232

3333
```
34-
docker run --rm --privileged -v $(pwd)/workspace:/CustoPiZer/workspace $(pwd)/scripts:/CustoPiZer/workspace/scripts ghcr.io/octoprint/custopizer:latest
34+
docker run --rm --privileged -v $(pwd)/workspace:/CustoPiZer/workspace -v $(pwd)/scripts:/CustoPiZer/workspace/scripts ghcr.io/octoprint/custopizer:latest
3535
```
3636

3737
## Can I do something like this as well?
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
set -x
2+
set -e
3+
4+
export LC_ALL=C
5+
6+
source /common.sh
7+
install_cleanup_trap
8+
9+
# if we already have the file updated, we don't need to do anything
10+
grep -q '=network.online.target' /etc/systemd/system/octoprint.service || exit 0
11+
12+
sed -i 's#=network\.online\.target$#=network-online.target#' /etc/systemd/system/octoprint.service

0 commit comments

Comments
 (0)