Skip to content

Commit 3117b43

Browse files
authored
Merge branch 'nextcloud:master' into master
2 parents edf5451 + e35f471 commit 3117b43

File tree

232 files changed

+60796
-100886
lines changed

Some content is hidden

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

232 files changed

+60796
-100886
lines changed

.drone.yml

Lines changed: 1 addition & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -1,151 +1,3 @@
1-
---
2-
kind: pipeline
3-
name: drone desktop client
4-
5-
steps:
6-
- name: cmake
7-
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
8-
volumes:
9-
- name: build
10-
path: /drone/build
11-
commands:
12-
- cd /drone/build
13-
- cmake /drone/src -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 -DADD_E2E_TESTS=ON
14-
15-
- name: compile
16-
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
17-
volumes:
18-
- name: build
19-
path: /drone/build
20-
commands:
21-
- cd /drone/build
22-
- ninja
23-
24-
- name: test
25-
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
26-
volumes:
27-
- name: build
28-
path: /drone/build
29-
commands:
30-
- cd /drone/build
31-
- ../src/admin/test/wait_for_server.sh "server"
32-
- useradd -m -s /bin/bash test
33-
- chown -R test:test .
34-
- su -c 'xvfb-run ctest --output-on-failure' test
35-
36-
services:
37-
- name: server
38-
image: ghcr.io/nextcloud/continuous-integration-shallow-server:latest # also change in updateScreenshots.sh
39-
environment:
40-
EVAL: true
41-
SERVER_VERSION: 'stable30'
42-
commands:
43-
- BRANCH="$SERVER_VERSION" /usr/local/bin/initnc.sh
44-
- echo 127.0.0.1 server >> /etc/hosts
45-
- apt-get update && apt-get install -y composer
46-
- su www-data -c "OC_PASS=user1 php /var/www/html/occ user:add --password-from-env --display-name='User One' user1"
47-
- su www-data -c "OC_PASS=user2 php /var/www/html/occ user:add --password-from-env --display-name='User Two' user2"
48-
- su www-data -c "OC_PASS=user3 php /var/www/html/occ user:add --password-from-env --display-name='User Three' user3"
49-
- su www-data -c "php /var/www/html/occ user:setting user2 files quota 1G"
50-
- su www-data -c "php /var/www/html/occ group:add users"
51-
- su www-data -c "php /var/www/html/occ group:adduser users user1"
52-
- su www-data -c "php /var/www/html/occ group:adduser users user2"
53-
- su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/activity.git /var/www/html/apps/activity/"
54-
- su www-data -c "php /var/www/html/occ app:enable activity"
55-
- su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/text.git /var/www/html/apps/text/"
56-
- su www-data -c "php /var/www/html/occ app:enable text"
57-
- su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/end_to_end_encryption.git /var/www/html/apps/end_to_end_encryption/"
58-
- su www-data -c "php /var/www/html/occ app:enable end_to_end_encryption"
59-
- su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/photos.git /var/www/html/apps/photos/"
60-
- su www-data -c "cd /var/www/html/apps/photos; composer install"
61-
- su www-data -c "php /var/www/html/occ app:enable -f photos"
62-
- /usr/local/bin/run.sh
63-
64-
volumes:
65-
- name: build
66-
temp: {}
67-
68-
trigger:
69-
branch:
70-
- master
71-
- stable-*
72-
event:
73-
- pull_request
74-
- push
75-
76-
---
77-
kind: pipeline
78-
name: qt-5.15-clang
79-
80-
steps:
81-
- name: cmake
82-
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
83-
volumes:
84-
- name: build
85-
path: /drone/build
86-
commands:
87-
- cd /drone/build
88-
- cmake /drone/src -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt -DCMAKE_C_COMPILER=clang-14 -DCMAKE_CXX_COMPILER=clang++-14 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 -DADD_E2E_TESTS=ON
89-
- name: compile
90-
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
91-
volumes:
92-
- name: build
93-
path: /drone/build
94-
commands:
95-
- cd /drone/build
96-
- ninja
97-
- name: test
98-
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
99-
volumes:
100-
- name: build
101-
path: /drone/build
102-
commands:
103-
- cd /drone/build
104-
- ../src/admin/test/wait_for_server.sh "server"
105-
- useradd -m -s /bin/bash test
106-
- chown -R test:test .
107-
- su -c 'xvfb-run ctest --output-on-failure' test
108-
109-
services:
110-
- name: server
111-
image: ghcr.io/nextcloud/continuous-integration-shallow-server:latest # also change in updateScreenshots.sh
112-
environment:
113-
EVAL: true
114-
SERVER_VERSION: 'stable30'
115-
commands:
116-
- BRANCH="$SERVER_VERSION" /usr/local/bin/initnc.sh
117-
- echo 127.0.0.1 server >> /etc/hosts
118-
- apt-get update && apt-get install -y composer
119-
- su www-data -c "OC_PASS=user1 php /var/www/html/occ user:add --password-from-env --display-name='User One' user1"
120-
- su www-data -c "OC_PASS=user2 php /var/www/html/occ user:add --password-from-env --display-name='User Two' user2"
121-
- su www-data -c "OC_PASS=user3 php /var/www/html/occ user:add --password-from-env --display-name='User Three' user3"
122-
- su www-data -c "php /var/www/html/occ user:setting user2 files quota 1G"
123-
- su www-data -c "php /var/www/html/occ group:add users"
124-
- su www-data -c "php /var/www/html/occ group:adduser users user1"
125-
- su www-data -c "php /var/www/html/occ group:adduser users user2"
126-
- su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/activity.git /var/www/html/apps/activity/"
127-
- su www-data -c "php /var/www/html/occ app:enable activity"
128-
- su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/text.git /var/www/html/apps/text/"
129-
- su www-data -c "php /var/www/html/occ app:enable text"
130-
- su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/end_to_end_encryption.git /var/www/html/apps/end_to_end_encryption/"
131-
- su www-data -c "php /var/www/html/occ app:enable end_to_end_encryption"
132-
- su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/photos.git /var/www/html/apps/photos/"
133-
- su www-data -c "cd /var/www/html/apps/photos; composer install"
134-
- su www-data -c "php /var/www/html/occ app:enable -f photos"
135-
- /usr/local/bin/run.sh
136-
137-
volumes:
138-
- name: build
139-
temp: {}
140-
141-
trigger:
142-
branch:
143-
- master
144-
- stable-*
145-
event:
146-
- pull_request
147-
- push
148-
1491
---
1502
kind: pipeline
1513
name: Debian
@@ -168,5 +20,5 @@ trigger:
16820
- push
16921
---
17022
kind: signature
171-
hmac: 4296d3beb6775fd1589c30b86412298de4f67e9791843c7bb484fc6d5bb01e4e
23+
hmac: e8978756454c02822b9b6b1b05013594fc5a6db04ac18537ef696fbf49700f7e
17224
...

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @camilasan @claucambra @mgallien @nilsding

.github/workflows/check-translations.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3
16-
- name: Check German
17-
run: |
18-
[[ $(grep "Benötigt keine Übersetzung" translations/client_de.ts -c) -gt 0 ]] && exit 1 || exit 0
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
- name: Check German
17+
run: |
18+
[[ $(grep "Benötigt keine Übersetzung" translations/client_de.ts -c) -gt 0 ]] && exit 1 || exit 0

.github/workflows/clang-format.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ jobs:
66
build:
77
runs-on: ubuntu-22.04
88
steps:
9-
- uses: actions/checkout@v4
10-
- uses: cpp-linter/cpp-linter-action@v2.13.4
9+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
10+
- uses: cpp-linter/cpp-linter-action@8ae6cfaea8cc035c6155b5fe79d7991a9bf638af # v2.14.0
1111
id: linter
1212
env:
1313
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/clang-tidy-review.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1313
with:
1414
fetch-depth: 2
1515
- name: Prepare compile_commands.json
@@ -24,7 +24,7 @@ jobs:
2424
/usr/bin/git config --global --add safe.directory "$GITHUB_WORKSPACE"
2525
/usr/bin/git diff -U0 HEAD^ | clang-tidy-diff-15.py -checks='-*,modernize-use-auto,modernize-use-using,modernize-use-nodiscard,modernize-use-nullptr,modernize-use-override,cppcoreguidelines-pro-type-static-cast-downcast' -p1 -path build -export-fixes clang-tidy-result/fixes.yml
2626
- name: Run clang-tidy-pr-comments action
27-
uses: platisd/[email protected] # >1.4.3 switches to composite method w/ a forced python version and breaks things: https://github.com/actions/setup-python/issues/871
27+
uses: platisd/clang-tidy-pr-comments@a8811fa17cd6bd02c52a3791b44f9840777e396a # v1.6.1 # >1.4.3 switches to composite method w/ a forced python version and breaks things: https://github.com/actions/setup-python/issues/871
2828
with:
2929
# The GitHub token (or a personal access token)
3030
github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/linux-appimage.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ jobs:
66
build:
77
name: Linux Appimage Package
88
runs-on: ubuntu-latest
9-
container: ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-el8-6.8.1-2
9+
container: ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-el8-6.8.2-1
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1212
with:
1313
fetch-depth: 1
1414

@@ -21,15 +21,15 @@ jobs:
2121
2222
- name: Upload AppImage artifact
2323
id: upload-appimage
24-
uses: actions/upload-artifact@v4
24+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
2525
with:
2626
name: nextcloud-appimage-pr-${{ github.event.number }}
2727
path: ${{ steps.build-appimage.outputs.APPIMAGE_NAME }}
2828
overwrite: true
2929
compression-level: 0 # squashfs is already compressed
3030

3131
- name: Comment AppImage
32-
uses: actions/github-script@v7
32+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
3333
with:
3434
script: |
3535
const comment_identifier_string = "<!-- automated comment for an appimage build -->";

.github/workflows/linux-clang-compile-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1212
with:
1313
fetch-depth: 1
1414
- name: Configure and compile

.github/workflows/linux-gcc-compile-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1212
with:
1313
fetch-depth: 1
1414
- name: Configure and compile

.github/workflows/macos-build-and-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
CRAFT_MASTER_CONFIG: ${{ github.workspace }}/craftmaster.ini
2020
CRAFT_BLUEPRINT_OPTIONS: ${{ matrix.craft_options }}
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323
with:
2424
fetch-depth: 1
2525

@@ -30,13 +30,13 @@ jobs:
3030
run: sudo xcode-select -s /Applications/Xcode_15.3.app/Contents/Developer
3131

3232
- name: Restore cache
33-
uses: actions/cache@v4
33+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
3434
with:
3535
path: ~/cache
3636
key: macos-latest-${{ env.CRAFT_TARGET }}
3737

3838
- name: Set up Python ${{ matrix.python-version }}
39-
uses: actions/setup-python@v5
39+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
4040
with:
4141
python-version: 3.12
4242

.github/workflows/needsinfo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
stale:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/stale@v9
10+
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
1111
with:
1212
operations-per-run: 1500
1313
days-before-stale: 28

0 commit comments

Comments
 (0)