Skip to content

Commit 4ceef01

Browse files
come-nccome-nc
authored
Merge branch 'master' into enh/support-php-8.3
Signed-off-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
2 parents cd471bd + 40852ef commit 4ceef01

File tree

1,371 files changed

+13971
-7425
lines changed

Some content is hidden

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

1,371 files changed

+13971
-7425
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
# Security team
3232
/resources/config/ca-bundle.crt @ChristophWurst @miaulalala @nickvergessen
33+
/.drone.yml @nickvergessen
3334

3435
# Two-Factor Authentication
3536
# https://github.com/nextcloud/wg-two-factor-authentication#members

‎.github/workflows/command-compile.yml‎

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

5555
steps:
5656
- name: Checkout ${{ needs.init.outputs.head_ref }}
57-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
57+
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.5.2
5858
with:
5959
token: ${{ secrets.COMMAND_BOT_PAT }}
6060
fetch-depth: 0

‎.github/workflows/command-pull-3rdparty.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
id: comment-branch
3131

3232
- name: Checkout ${{ steps.comment-branch.outputs.head_ref }}
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
3434
with:
3535
fetch-depth: 0
3636
token: ${{ secrets.COMMAND_BOT_PAT }}

‎.github/workflows/command-rebase.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
reaction-type: "+1"
3232

3333
- name: Checkout the latest code
34-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
34+
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.5.2
3535
with:
3636
fetch-depth: 0
3737
token: ${{ secrets.COMMAND_BOT_PAT }}

‎.github/workflows/cypress.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: Checkout app
26-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
26+
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.5.2
2727

2828
- name: Check composer.json
2929
id: check_composer
@@ -112,7 +112,7 @@ jobs:
112112
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
113113

114114
- name: Upload snapshots
115-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
115+
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
116116
if: always()
117117
with:
118118
name: snapshots_${{ matrix.containers }}
@@ -123,7 +123,7 @@ jobs:
123123
run: docker logs nextcloud-cypress-tests-${{ env.APP_NAME }} > nextcloud.log
124124

125125
- name: Upload NC logs
126-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
126+
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
127127
if: failure() && matrix.containers != 'component'
128128
with:
129129
name: nc_logs_${{ matrix.containers }}
@@ -134,7 +134,7 @@ jobs:
134134
run: docker exec nextcloud-cypress-tests-server tar -cvjf - data > data.tar
135135

136136
- name: Upload data dir archive
137-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
137+
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
138138
if: failure() && matrix.containers != 'component'
139139
with:
140140
name: nc_data_${{ matrix.containers }}

‎.github/workflows/ftp.yml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ on:
55
- master
66
- stable*
77
paths:
8+
- '.github/**'
89
- 'apps/files_external/**'
910
pull_request:
1011
paths:
12+
- '.github/**'
1113
- 'apps/files_external/**'
1214

1315
env:
@@ -30,17 +32,19 @@ jobs:
3032

3133
steps:
3234
- name: Checkout server
33-
uses: actions/checkout@v3
35+
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
3436
with:
3537
submodules: true
3638

3739
- name: Set up ftpd
3840
run: |
3941
sudo mkdir /tmp/ftp
40-
sudo chown -R 0777 /tmp/ftp
41-
if [[ "${{ matrix.ftpd }}" == 'proftpd' ]]; then docker run --name ftp -d --net host -e FTP_USERNAME=test -e FTP_PASSWORD=test -v /tmp/ftp:/home/test hauptmedia/proftpd; fi
42+
sudo chmod -R 0777 /tmp/ftp
43+
if [[ "${{ matrix.ftpd }}" == 'proftpd' ]]; then echo '$6$Q7V2n3q2GRVv5YeQ$/AhLu07H76Asojy7bxGXMY1caKLAbp5Vt82LOZYMkD/8uDzyMAEXwk0c1Bdz1DkBsk2Vh/9SF130mOPavRGMo.' > /tmp/secret.txt; fi
44+
if [[ "${{ matrix.ftpd }}" == 'proftpd' ]]; then echo 'FTP_ROOT=/home/test' > $GITHUB_ENV; fi
45+
if [[ "${{ matrix.ftpd }}" == 'proftpd' ]]; then docker run --name ftp -d --net host -e PASV_ADDRESS=127.0.0.1 -e FTPUSER_NAME=test -v /tmp/secret.txt:/run/secrets/ftp-user-password-secret -v /tmp/ftp:/home/test instantlinux/proftpd; fi
4246
if [[ "${{ matrix.ftpd }}" == 'vsftpd' ]]; then docker run --name ftp -d --net host -e FTP_USER=test -e FTP_PASS=test -e PASV_ADDRESS=127.0.0.1 -v /tmp/ftp:/home/vsftpd/test fauria/vsftpd; fi
43-
if [[ "${{ matrix.ftpd }}" == 'pure-ftpd' ]]; then docker run --name ftp -d --net host -e "PUBLICHOST=localhost" -e FTP_USER_NAME=test -e FTP_USER_PASS=test -e FTP_USER_HOME=/home/test -v /tmp/ftp2:/home/test -v /tmp/ftp2:/etc/pure-ftpd/passwd stilliard/pure-ftpd; fi
47+
if [[ "${{ matrix.ftpd }}" == 'pure-ftpd' ]]; then docker run --name ftp -d --net host -e "PUBLICHOST=localhost" -e FTP_USER_NAME=test -e FTP_USER_PASS=test -e FTP_USER_HOME=/home/test -v /tmp/ftp:/home/test -v /tmp/ftp:/etc/pure-ftpd/passwd stilliard/pure-ftpd; fi
4448
- name: Set up php ${{ matrix.php-versions }}
4549
uses: shivammathur/setup-php@72ae4ccbe57f82bbe08411e84e2130bd4ba1c10f # v2.25.5
4650
with:
@@ -58,13 +62,14 @@ jobs:
5862
php -S localhost:8080 &
5963
- name: smoketest ftp
6064
run: |
61-
php -r 'var_dump(file_put_contents("ftp://test:test@localhost/ftp.txt", "asd"));'
62-
php -r 'var_dump(file_get_contents("ftp://test:test@localhost/ftp.txt"));'
63-
php -r 'var_dump(mkdir("ftp://test:test@localhost/asdads"));'
65+
php -r 'var_dump(file_put_contents("ftp://test:test@localhost${{ env.FTP_ROOT }}/ftp.txt", "asd"));'
66+
php -r 'var_dump(file_get_contents("ftp://test:test@localhost${{ env.FTP_ROOT }}/ftp.txt"));'
67+
php -r 'var_dump(mkdir("ftp://test:test@localhost${{ env.FTP_ROOT }}/asdads"));'
6468
ls -l /tmp/ftp
69+
[ -f /tmp/ftp/ftp.txt ]
6570
- name: PHPUnit
6671
run: |
67-
echo "<?php return ['run' => true,'host' => 'localhost','user' => 'test','password' => 'test', 'root' => ''];" > apps/${{ env.APP_NAME }}/tests/config.ftp.php
72+
echo "<?php return ['run' => true,'host' => 'localhost','user' => 'test','password' => 'test', 'root' => '${{ env.FTP_ROOT }}'];" > apps/${{ env.APP_NAME }}/tests/config.ftp.php
6873
phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/FtpTest.php
6974
- name: ftpd logs
7075
if: always()

‎.github/workflows/lint-eslint.yml‎

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

3939
steps:
4040
- name: Checkout
41-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
41+
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.5.2
4242

4343
- name: Read package.json node and npm engines version
4444
uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.1

‎.github/workflows/lint-php-cs.yml‎

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

2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
25+
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.5.2
2626

2727
- name: Set up php
2828
uses: shivammathur/setup-php@72ae4ccbe57f82bbe08411e84e2130bd4ba1c10f # v2.25.5

‎.github/workflows/lint-php.yml‎

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

3232
steps:
3333
- name: Checkout
34-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
34+
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.5.2
3535

3636
- name: Set up php ${{ matrix.php-versions }}
3737
uses: shivammathur/setup-php@72ae4ccbe57f82bbe08411e84e2130bd4ba1c10f # v2.25.5

‎.github/workflows/node-tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
2323

2424
- name: Read package.json node and npm engines version
2525
uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: Checkout
37-
uses: actions/checkout@v3
37+
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
3838

3939
- name: Set up node ${{ needs.versions.outputs.nodeVersion }}
4040
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
@@ -61,7 +61,7 @@ jobs:
6161

6262
steps:
6363
- name: Checkout
64-
uses: actions/checkout@v3
64+
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
6565

6666
- name: Set up node ${{ needs.versions.outputs.nodeVersion }}
6767
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
@@ -83,7 +83,7 @@ jobs:
8383

8484
steps:
8585
- name: Checkout
86-
uses: actions/checkout@v3
86+
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
8787

8888
- name: Set up node ${{ needs.versions.outputs.nodeVersion }}
8989
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c

0 commit comments

Comments
 (0)