Skip to content

Commit cbe4e78

Browse files
authored
Merge branch 'ZoneMinder:master' into patch-23613
2 parents 9b00b37 + 88d1a93 commit cbe4e78

Some content is hidden

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

51 files changed

+6255
-190
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ web/skins/classic/assets
2121
web/js/janus.js
2222
web/js/ajaxQueue.js
2323
web/js/hls-1.5.20/
24+
web/js/noUiSlider-15.8.1/
2425
web/js/dms.js
2526

2627
# Cannot be parsed as JS

.github/workflows/ci-bookworm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: apt-get -qq update && apt-get -qq upgrade
3838
- name: Install git
3939
run: apt-get -qq install git
40-
- uses: actions/checkout@v4
40+
- uses: actions/checkout@v5
4141
with:
4242
submodules: recursive
4343
- name: Install dependencies

.github/workflows/ci-bullseye.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: apt-get -qq update && apt-get -qq upgrade
3838
- name: Install git
3939
run: apt-get -qq install git
40-
- uses: actions/checkout@v4
40+
- uses: actions/checkout@v5
4141
with:
4242
submodules: recursive
4343
- name: Install dependencies

.github/workflows/ci-centos-8.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: yum -y install "dnf-command(config-manager)" https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && yum config-manager --set-enabled powertools
3030
- name: Install git
3131
run: yum -y install git
32-
- uses: actions/checkout@v4
32+
- uses: actions/checkout@v5
3333
with:
3434
submodules: recursive
3535
- name: Install dependencies

.github/workflows/ci-eslint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
with:
2020
submodules: recursive
2121
- name: Install ESLint

.github/workflows/ci-focal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
add-apt-repository ppa:git-core/ppa
3535
apt-get -qq update
3636
apt-get -qq install git
37-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v5
3838
with:
3939
submodules: recursive
4040
- name: Install dependencies

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
steps:
3939
- name: Checkout repository
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@v5
4141
with:
4242
# We must fetch at least the immediate parents so that if this is
4343
# a pull request then we can checkout the head.

.github/workflows/create-packages.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ jobs:
2727
- os: debian
2828
dist: bookworm
2929
arch: x86_64
30+
- os: debian
31+
dist: trixie
32+
arch: x86_64
3033
- os: debian
3134
dist: bullseye
3235
arch: aarch64
@@ -39,10 +42,13 @@ jobs:
3942
- os: debian
4043
dist: bookworm
4144
arch: aarch64
45+
- os: debian
46+
dist: trixie
47+
arch: aarch64
4248
runs-on: ubuntu-latest
4349

4450
steps:
45-
- uses: actions/checkout@v4
51+
- uses: actions/checkout@v5
4652
with:
4753
fetch-depth: '0'
4854
submodules: recursive

.github/workflows/depsreview.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: 'Checkout Repository'
12-
uses: actions/checkout@v4
12+
uses: actions/checkout@v5
1313
- name: 'Dependency Review'
1414
uses: actions/dependency-review-action@v4

.github/workflows/release-packages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
with:
2424
fetch-depth: '0'
2525
submodules: recursive

0 commit comments

Comments
 (0)