Skip to content

Commit 3fa2f80

Browse files
bahman026bahman
authored andcommitted
Merge branch 'main' into prevent-invalid-year-input
Signed-off-by: bahman <42313073+bahman026@users.noreply.github.com>
2 parents 86fca81 + c80f76c commit 3fa2f80

423 files changed

Lines changed: 18801 additions & 7538 deletions

File tree

Some content is hidden

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

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "ghcr.io/juliusknorr/nextcloud-dev-php81:latest",
2+
"image": "ghcr.io/juliusknorr/nextcloud-dev-php84:latest",
33
"forwardPorts": [80],
44
"containerEnv": {
55
"NEXTCLOUD_AUTOINSTALL_APPS": "deck",

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# App maintainers
2-
* @luka-nextcloud @grnd-alt @elzody
2+
* @luka-nextcloud @grnd-alt

.github/dependabot.yml

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,61 +8,81 @@ updates:
88
day: saturday
99
time: "03:00"
1010
timezone: Europe/Paris
11+
cooldown:
12+
default-days: 10
1113
open-pull-requests-limit: 10
14+
labels:
15+
- 3. to review
16+
- dependencies
1217
reviewers:
1318
- juliushaertl
1419
- luka-nextcloud
1520

1621
- package-ecosystem: npm
17-
target-branch: stable32
22+
target-branch: stable34
1823
versioning-strategy: lockfile-only
1924
directory: "/"
2025
schedule:
2126
interval: weekly
2227
day: saturday
2328
time: "03:15"
2429
timezone: Europe/Paris
30+
cooldown:
31+
default-days: 10
2532
ignore:
2633
- dependency-name: "*"
2734
update-types: ["version-update:semver-major"]
2835
open-pull-requests-limit: 30
2936
labels:
3037
- 3. to review
3138
- dependencies
39+
reviewers:
40+
- juliushaertl
41+
- luka-nextcloud
3242

3343
- package-ecosystem: npm
34-
target-branch: stable31
44+
target-branch: stable33
3545
versioning-strategy: lockfile-only
3646
directory: "/"
3747
schedule:
3848
interval: weekly
3949
day: saturday
4050
time: "03:15"
4151
timezone: Europe/Paris
52+
cooldown:
53+
default-days: 10
4254
ignore:
4355
- dependency-name: "*"
4456
update-types: ["version-update:semver-major"]
4557
open-pull-requests-limit: 30
4658
labels:
4759
- 3. to review
4860
- dependencies
61+
reviewers:
62+
- juliushaertl
63+
- luka-nextcloud
4964

5065
- package-ecosystem: npm
51-
target-branch: stable30
66+
target-branch: stable32
5267
versioning-strategy: lockfile-only
5368
directory: "/"
5469
schedule:
5570
interval: weekly
5671
day: saturday
57-
time: "03:30"
72+
time: "03:15"
5873
timezone: Europe/Paris
74+
cooldown:
75+
default-days: 10
5976
ignore:
6077
- dependency-name: "*"
6178
update-types: ["version-update:semver-major"]
6279
open-pull-requests-limit: 30
6380
labels:
6481
- 3. to review
6582
- dependencies
83+
reviewers:
84+
- juliushaertl
85+
- luka-nextcloud
6686

6787
- package-ecosystem: composer
6888
directory: "/"
@@ -71,6 +91,8 @@ updates:
7191
day: saturday
7292
time: "03:45"
7393
timezone: Europe/Paris
94+
cooldown:
95+
default-days: 10
7496
open-pull-requests-limit: 10
7597
reviewers:
7698
- juliushaertl
@@ -83,6 +105,8 @@ updates:
83105
day: saturday
84106
time: "04:00"
85107
timezone: Europe/Paris
108+
cooldown:
109+
default-days: 10
86110
open-pull-requests-limit: 10
87111
reviewers:
88112
- juliushaertl
@@ -95,6 +119,8 @@ updates:
95119
day: saturday
96120
time: "04:15"
97121
timezone: Europe/Paris
122+
cooldown:
123+
default-days: 10
98124
open-pull-requests-limit: 10
99125
reviewers:
100126
- juliushaertl

.github/workflows/appbuild.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

.github/workflows/appstore-build-publish.yml

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ jobs:
3535
echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
3636
3737
- name: Checkout
38-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
38+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3939
with:
4040
persist-credentials: false
4141
path: ${{ env.APP_NAME }}
4242

4343
- name: Get app version number
4444
id: app-version
45-
uses: skjnldsv/xpath-action@f5b036e9d973f42c86324833fd00be90665fbf77 # master
45+
uses: skjnldsv/xpath-action@f5b036e9d973f42c86324833fd00be90665fbf77 # v1.0.0
4646
with:
4747
filename: ${{ env.APP_NAME }}/appinfo/info.xml
4848
expression: "//info//version/text()"
@@ -53,7 +53,7 @@ jobs:
5353
5454
- name: Get appinfo data
5555
id: appinfo
56-
uses: skjnldsv/xpath-action@f5b036e9d973f42c86324833fd00be90665fbf77 # master
56+
uses: skjnldsv/xpath-action@f5b036e9d973f42c86324833fd00be90665fbf77 # v1.0.0
5757
with:
5858
filename: ${{ env.APP_NAME }}/appinfo/info.xml
5959
expression: "//info//dependencies//nextcloud/@min-version"
@@ -65,13 +65,13 @@ jobs:
6565
continue-on-error: true
6666
with:
6767
path: ${{ env.APP_NAME }}
68-
fallbackNode: '^20'
69-
fallbackNpm: '^10'
68+
fallbackNode: '^24'
69+
fallbackNpm: '^11.3'
7070

7171
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
7272
# Skip if no package.json
7373
if: ${{ steps.versions.outputs.nodeVersion }}
74-
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v4.1.0
74+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
7575
with:
7676
node-version: ${{ steps.versions.outputs.nodeVersion }}
7777

@@ -82,12 +82,12 @@ jobs:
8282

8383
- name: Get php version
8484
id: php-versions
85-
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
85+
uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2.3.1.3.2
8686
with:
8787
filename: ${{ env.APP_NAME }}/appinfo/info.xml
8888

8989
- name: Set up php ${{ steps.php-versions.outputs.php-min }}
90-
uses: shivammathur/setup-php@0f7f1d08e3e32076e51cae65eb0b0c871405b16e # v2.34.1
90+
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
9191
with:
9292
php-version: ${{ steps.php-versions.outputs.php-min }}
9393
coverage: none
@@ -140,23 +140,31 @@ jobs:
140140
cd ${{ env.APP_NAME }}
141141
make appstore
142142
143-
- name: Checkout server ${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }}
144-
continue-on-error: true
145-
id: server-checkout
143+
- name: Check server download link for ${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }}
146144
run: |
147145
NCVERSION='${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }}'
148-
wget --quiet https://download.nextcloud.com/server/releases/latest-$NCVERSION.zip
149-
unzip latest-$NCVERSION.zip
146+
DOWNLOAD_URL=$(curl -s "https://updates.nextcloud.com/updater_server/latest?channel=beta&version=$NCVERSION" | jq -r '.downloads.zip[0]')
147+
echo "DOWNLOAD_URL=$DOWNLOAD_URL" >> $GITHUB_ENV
148+
149+
- name: Download server ${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }}
150+
continue-on-error: true
151+
id: server-download
152+
if: ${{ env.DOWNLOAD_URL != 'null' }}
153+
run: |
154+
echo "Downloading release tarball from $DOWNLOAD_URL"
155+
wget $DOWNLOAD_URL -O nextcloud.zip
156+
unzip nextcloud.zip
150157
151158
- name: Checkout server master fallback
152-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
153-
if: ${{ steps.server-checkout.outcome != 'success' }}
159+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
160+
if: ${{ steps.server-download.outcome != 'success' }}
154161
with:
155162
persist-credentials: false
156163
submodules: true
157164
repository: nextcloud/server
158165
path: nextcloud
159166

167+
160168
- name: Sign app
161169
run: |
162170
# Extracting release
@@ -173,7 +181,7 @@ jobs:
173181
tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }}
174182
175183
- name: Attach tarball to github release
176-
uses: svenstaro/upload-release-action@81c65b7cd4de9b2570615ce3aad67a41de5b1a13 # v2
184+
uses: svenstaro/upload-release-action@29e53e917877a24fad85510ded594ab3c9ca12de # v2.11.5
177185
id: attach_to_release
178186
with:
179187
repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -183,7 +191,7 @@ jobs:
183191
overwrite: true
184192

185193
- name: Upload app to Nextcloud appstore
186-
uses: nextcloud-releases/nextcloud-appstore-push-action@a011fe619bcf6e77ddebc96f9908e1af4071b9c1 # v1
194+
uses: nextcloud-releases/nextcloud-appstore-push-action@a011fe619bcf6e77ddebc96f9908e1af4071b9c1 # v1.0.3
187195
with:
188196
app_name: ${{ env.APP_NAME }}
189197
appstore_token: ${{ secrets.APPSTORE_TOKEN }}

0 commit comments

Comments
 (0)