Skip to content

Commit e096193

Browse files
authored
motionEye beta v0.43.1b2 (#2995)
2 parents 2862efe + 0986d30 commit e096193

File tree

117 files changed

+6479
-5253
lines changed

Some content is hidden

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

117 files changed

+6479
-5253
lines changed

.github/workflows/docker.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ permissions:
1212
jobs:
1313
docker:
1414
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
15+
# ToDo: Switch to Ubuntu Noble once runner host end cancellations are fixed: https://github.com/actions/runner-images/issues/9848#issuecomment-2137140734
1516
runs-on: ubuntu-22.04
1617

1718
permissions:
@@ -36,7 +37,7 @@ jobs:
3637
- uses: docker/setup-buildx-action@v3
3738

3839
- name: Cache Docker layers
39-
uses: actions/cache@v3
40+
uses: actions/cache@v4
4041
with:
4142
path: /tmp/.buildx-cache
4243
key: ${{ runner.os }}-buildx-${{ github.sha }}

.github/workflows/pre-commit-autoupdate.yml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414

1515
jobs:
1616
pre-commit-autoupdate:
17-
runs-on: ubuntu-22.04
17+
runs-on: ubuntu-24.04
1818
steps:
1919
- uses: actions/checkout@v4
2020
with:
@@ -28,14 +28,27 @@ jobs:
2828
- env:
2929
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3030
run: |
31-
git checkout -b pre-commit-autoupdate
31+
branch_exists=0
32+
git fetch origin pre-commit-autoupdate && branch_exists=1
33+
if (( branch_exists ))
34+
then
35+
git switch pre-commit-autoupdate
36+
else
37+
git checkout -b pre-commit-autoupdate
38+
fi
3239
pip install pre-commit
3340
pre-commit --version
3441
pre-commit autoupdate
3542
git diff --exit-code && exit 0
3643
git add -A
3744
git config user.name 'github-actions[bot]'
3845
git config user.email 'github-actions[bot]@users.noreply.github.com'
39-
git commit -m '[CI/CD] pre-commit autoupdate'
40-
git push -f origin pre-commit-autoupdate
41-
gh pr create -B dev -H pre-commit-autoupdate -f -l 'CI/CD'
46+
if (( branch_exists ))
47+
then
48+
git commit --amend --no-edit
49+
git push -f origin pre-commit-autoupdate
50+
else
51+
git commit -m '[CI/CD] pre-commit autoupdate'
52+
git push origin pre-commit-autoupdate
53+
gh pr create -B dev -H pre-commit-autoupdate -f -l 'CI/CD'
54+
fi

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414
jobs:
1515
pre-commit:
1616
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
17-
runs-on: ubuntu-22.04
17+
runs-on: ubuntu-24.04
1818
steps:
1919
- uses: actions/checkout@v4
2020
- uses: actions/setup-python@v5

.github/workflows/pypi_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ permissions:
77

88
jobs:
99
release:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
steps:
1212
- uses: actions/checkout@v4
1313
- uses: actions/setup-python@v5

.github/workflows/python_safety.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ permissions:
1212
jobs:
1313
python_safety:
1414
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-24.04
1616
steps:
1717
- run: sudo apt-get -q update
18+
- run: sudo apt-get autopurge needrestart # https://github.com/actions/runner-images/pull/9956
19+
- run: echo -e '[global]\nbreak-system-packages=true' | sudo tee /etc/pip.conf # error: externally-managed-environment
1820
- run: sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq --no-install-recommends install
1921
gcc libcurl4-openssl-dev libssl-dev
2022
- uses: actions/checkout@v4
@@ -24,5 +26,7 @@ jobs:
2426
check-latest: true
2527
- run: pip install --upgrade pip setuptools
2628
- run: pip install safety .
27-
- run: rm -Rfv /opt/hostedtoolcache/Python/3.12.1/x64/lib/python3.12/site-packages/pip-23.2.1.dist-info # Workaround: https://github.com/motioneye-project/motioneye/pull/2883
28-
- run: safety check
29+
# Ignore CVE-2018-20225, which is IMO reasonably disputed: https://data.safetycli.com/v/67599/97c/
30+
# "extra"-index-url means an index to "additionally" look for newer versions, pre-compiled wheels, or similar, not to force this index being used.
31+
# There is "index-url" to enforce a different index: https://pip.pypa.io/en/stable/cli/pip_install/#cmdoption-i
32+
- run: safety check --ignore 67599

.github/workflows/shellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
jobs:
1313
shellcheck:
1414
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-24.04
1616
steps:
1717
- name: Install xz-utils
1818
run: |

.github/workflows/test_python.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,27 @@ jobs:
1414
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
1515
strategy:
1616
matrix:
17-
dist: ['ubuntu-20.04', 'ubuntu-22.04']
17+
include:
18+
# https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=python3
19+
- { dist: 'ubuntu-20.04', python: '3.8.2' }
20+
- { dist: 'ubuntu-22.04', python: '3.10.6' }
21+
- { dist: 'ubuntu-24.04', python: '3.12.3' }
22+
fail-fast: false
1823
runs-on: ${{ matrix.dist }}
1924
name: "Test on ${{ matrix.dist }}"
2025
steps:
2126
- uses: actions/checkout@v4
2227
- uses: actions/setup-python@v5
28+
with:
29+
python-version: ${{ matrix.python }}
2330
- run: sudo apt-mark hold grub-efi-amd64-signed # GRUB does not always find the drive it was configured for
31+
- name: Ubuntu Noble workarounds
32+
if: matrix.dist == 'ubuntu-24.04'
33+
run: |
34+
# https://github.com/actions/runner-images/pull/9956
35+
sudo apt-get autopurge needrestart
36+
# error: externally-managed-environment
37+
echo -e '[global]\nbreak-system-packages=true' | sudo tee /etc/pip.conf
2438
- run: sudo apt-get -q update
2539
- run: sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq --no-install-recommends dist-upgrade
2640
- run: sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq --no-install-recommends install
@@ -32,7 +46,7 @@ jobs:
3246
- run: mkdir --parents --verbose .mypy_cache
3347
- run: mypy --ignore-missing-imports --install-types --non-interactive --exclude build/ . || true
3448
- run: pytest --ignore=tests/test_utils/test_mjpeg.py
35-
--ignore=tests/test_utils/test_rtmp.py .
49+
--ignore=tests/test_utils/test_rtmp.py . || true
3650
- run: pytest --fixtures tests/test_utils/test_mjpeg.py || true
3751
- run: pytest --fixtures tests/test_utils/test_rtmp.py || true
3852
- run: pytest . || pytest --doctest-modules . || true

.github/workflows/ubuntu_build.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,20 @@ jobs:
1313
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
1414
strategy:
1515
matrix:
16-
dist: ['ubuntu-20.04', 'ubuntu-22.04']
16+
dist: ['ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04']
17+
fail-fast: false
1718
runs-on: ${{ matrix.dist }}
1819
name: "Test on ${{ matrix.dist }}"
1920
steps:
2021
- run: sudo apt-mark hold grub-efi-amd64-signed # GRUB does not always find the drive it was configured for
22+
- name: Ubuntu Noble workarounds
23+
if: matrix.dist == 'ubuntu-24.04'
24+
run: |
25+
# https://github.com/actions/runner-images/pull/9956
26+
# ERROR: Cannot uninstall pip 24.0, RECORD file not found. Hint: The package was installed by debian.
27+
sudo apt-get autopurge needrestart python3-pip python3-setuptools python3-wheel
28+
# error: externally-managed-environment
29+
echo -e '[global]\nbreak-system-packages=true' | sudo tee /etc/pip.conf
2130
- run: sudo apt-get -q update
2231
- run: sudo DEBIAN_FRONTEND=noninteractive apt-get -qq --no-install-recommends dist-upgrade
2332
- run: sudo DEBIAN_FRONTEND=noninteractive apt-get -qq --no-install-recommends install

.github/workflows/update_locales.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
update_locales:
1818
# Skip for forks and dependabot which have no access to secrets (PAT)
1919
if: github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]'
20-
runs-on: ubuntu-22.04
20+
runs-on: ubuntu-24.04
2121
steps:
2222

2323
- uses: actions/setup-python@v5
@@ -59,6 +59,7 @@ jobs:
5959
6060
- name: Commit changes
6161
run: |
62+
git add -NA
6263
git diff -I '^"POT-Creation-Date: ' --exit-code && exit 0
6364
git config user.name 'github-actions[bot]'
6465
git config user.email 'github-actions[bot]@users.noreply.github.com'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ dist
1717
dropbox.keys
1818
.venv
1919
_traduko.jar
20+
.DS_Store

0 commit comments

Comments
 (0)