File tree Expand file tree Collapse file tree 3 files changed +9
-2
lines changed
Expand file tree Collapse file tree 3 files changed +9
-2
lines changed Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff 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"
Original file line number Diff line number Diff line change 2323if [ $(/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
2525fi
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
You can’t perform that action at this time.
0 commit comments