Skip to content

Commit 1e3a7d8

Browse files
committed
Merge branch 'main' into camera-streamer
2 parents 317c0c1 + 54945ec commit 1e3a7d8

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

.github/ISSUE_TEMPLATE/01_bug_report.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ body:
2424
- 80-install-user-fix
2525
- 81-fix-octopi-txt
2626
- 82-fix-welcome-banner
27+
- 83-fix-service-dependencies
2728
- 99-write-build
2829
validations:
2930
required: true

.github/workflows/custopize.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@ jobs:
150150
151151
- name: "🔎 Determine e2e branch"
152152
run: |
153-
E2E_BRANCH="master"
153+
E2E_BRANCH="main"
154154
if [[ "${{ env.OCTOPRINT_VERSION }}" == *"-rc"* ]]; then
155-
E2E_BRANCH="maintenance"
155+
E2E_BRANCH="dev"
156156
fi
157157
158158
echo "E2E branch: $E2E_BRANCH"

scripts/02-update-octoprint

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,9 @@ fi
2323
if [ $(/usr/local/bin/yq '.server.seenWizards.file_check' /home/pi/.octoprint/config.yaml) == "null" ]; then
2424
sudo -u $USER FILECHECK_WIZARD=$(sudo -u $USER $VENV/bin/python -c "import octoprint_file_check; print(octoprint_file_check.WIZARD_VERSION)") /usr/local/bin/yq -i '.server.seenWizards.file_check = env(FILECHECK_WIZARD)' /home/pi/.octoprint/config.yaml
2525
fi
26+
27+
# fixes for broken packages from piwheels
28+
if [[ $(sudo -u $USER $VENV/bin/python --version | cut -d' ' -f2) =~ ^3\.11\. && $(sudo -u $USER $VENV/bin/pip freeze | grep -i tornado | cut -d= -f3) == "6.4.2" ]]; then
29+
# fetch sdist for tornado 6.4.2 under Python 3.11
30+
sudo -u $USER $VENV/bin/pip install --no-binary=tornado "tornado==6.4.2" --force-reinstall
31+
fi

0 commit comments

Comments
 (0)