Skip to content

Commit

Permalink
Merge branch 'master' into feat/23-beta1-from-22.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@skjnldsv
skjnldsv authored Nov 4, 2021
2 parents 5d36703 + 1e7e184 commit 924a957
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 85 deletions.
90 changes: 45 additions & 45 deletions config/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -507,18 +507,18 @@
'beta' => [
'23' => [
'100' => [
'latest' => '23.0.0 beta 2',
'internalVersion' => '23.0.0.5',
'downloadUrl' => 'https://download.nextcloud.com/server/prereleases/nextcloud-23.0.0beta2.zip',
'latest' => '23.0.0 beta 3',
'internalVersion' => '23.0.0.6',
'downloadUrl' => 'https://download.nextcloud.com/server/prereleases/nextcloud-23.0.0beta3.zip',
'web' => 'https://docs.nextcloud.com/server/23/admin_manual/maintenance/upgrade.html',
'eol' => false,
'minPHPVersion' => '7.3',
'signature' => 's7x3N92Y+mrFW4OPpYAHVNOgd5LW1lj4ncrNIOoICsj0eeIcz35soNV/6BGGK9iI
1C6da6Xp5a3PeL72vy5dww9WJeVTp/alhzETVuh4TT66cvu7pjZYElgCqc1FitQ2
6cfgMBnrh8cflg3LWMt1gabMOBQK/hnZgbVDlkbN721RmPStin5jarcgs9mYkvHD
uSTgRl2dJojigwOvrLxyp8yuef1fDg6Jr+rucwZq26LGsL8ZQ5G3NZzY0fNK9rHz
KGDobeM3BZVyCSVjOTdgIfTfyuoX3dXdhIE7Auh9RrI8bzKenrCjUw6QeG9P+yCC
NwRSqbNyNFgt32XNH35cVA==',
'signature' => 'a5V0gwEdnalEkxHH1UCBOXqeUC8GpXJu2lioLQ4tZLziPYrXSdumFc6Wqcl0qRnJ
9mXUmb56IPF9wpM+OVFFP3edXSrxPn7sjyIWmGDUcj4VbfJAyQYTIqK3KUSF2UNP
wQHNOPr06P1zVK1Lbj82QaxwYE2gsLp5N/jUELit6WyiAvGSf0e+p2yGuOE7H4V5
dQj/sCFAGkcdfZG444M7aAuXnmjJrhmH6WA1d1SkGJxYnnPP5Tmer2NdAy5m7tpl
DzzuOS7hHkZtR3wIA+SwPh2BWI2YpzdcZNTs3iNTMRsx6bRH2e6XAw9eu87uh89c
8IN/c1zctNQteUZwdtsSBQ==',
],
],

Expand Down Expand Up @@ -575,68 +575,68 @@

'21' => [
'100' => [
'latest' => '21.0.5',
'internalVersion' => '21.0.5.1',
'downloadUrl' => 'https://download.nextcloud.com/server/releases/nextcloud-21.0.5.zip',
'latest' => '21.0.6',
'internalVersion' => '21.0.6.0',
'downloadUrl' => 'https://download.nextcloud.com/server/prereleases/nextcloud-21.0.6rc1.zip',
'web' => 'https://docs.nextcloud.com/server/21/admin_manual/maintenance/upgrade.html',
'eol' => false,
'minPHPVersion' => '7.3',
'signature' => 'EzWqv/JVdeINrZ/6qi55G4g9ynIoP3RPIVh9iWPsvndJZATspnhruvsXnht1l1em
5apzHR4qT9jrgrxI/3Lzd68TWSK6gWuQqRwhbLMAicQNgpTOjdDB6TL/BYsEXbtq
1Hm5magelP5aC+L141lth9g/sEAr4BvI+NSw+/BfnxPxRg67UPYYx/TY//RzfNiw
qtwt0NkL87IvVXD4Hu0qFjMv270UP6QD/qXzs2i28nbDq3mOGZCJ3EfxoX0aM1U6
k7lerNTea/T8WCE5ldZa+wo9OxG3E4ynbrjkB/OQSRriYUip6jAXVeJHEOY5h9ax
jKk1eJzEsmg8xQ+fkUQSLw==',
'signature' => 'YQqOnv3ofHZyNTotfnGd/y9vo/YE2fbh4oAc43tllDepNn6YNw5G1VGvAaWVKHVM
pQ42vpESfE8dbP68GMt/wbC/XzqvhxumBN/IFMGuR9H07T7KMM3L+Zvx4KO3bDst
BrnMHWg/qX5cUMv3X3rE01tgUbcO7LCIj9unIsi+sw1l78eaiXWM05cMWLt6ftl0
/uuGqYXqm+ZsJZYa/p7wYofaOVwdpnO7jR7rktibmFQLT2QhTJz49ZkqmRgOTO1K
N8/z6Bz9Cxw0vlsc51+a7lieSnYu//mLEjfYYySnqWkuh1LiuQpdvtKS9QZTurOu
Lz+/hpNrcKkpGC070S0lZg==',
],
],

'20.0.13' => [
'100' => [
'latest' => '21.0.5',
'internalVersion' => '21.0.5.1',
'downloadUrl' => 'https://download.nextcloud.com/server/releases/nextcloud-21.0.5.zip',
'latest' => '21.0.6',
'internalVersion' => '21.0.6.0',
'downloadUrl' => 'https://download.nextcloud.com/server/prereleases/nextcloud-21.0.6rc1.zip',
'web' => 'https://docs.nextcloud.com/server/21/admin_manual/maintenance/upgrade.html',
'eol' => false,
'minPHPVersion' => '7.3',
'signature' => 'EzWqv/JVdeINrZ/6qi55G4g9ynIoP3RPIVh9iWPsvndJZATspnhruvsXnht1l1em
5apzHR4qT9jrgrxI/3Lzd68TWSK6gWuQqRwhbLMAicQNgpTOjdDB6TL/BYsEXbtq
1Hm5magelP5aC+L141lth9g/sEAr4BvI+NSw+/BfnxPxRg67UPYYx/TY//RzfNiw
qtwt0NkL87IvVXD4Hu0qFjMv270UP6QD/qXzs2i28nbDq3mOGZCJ3EfxoX0aM1U6
k7lerNTea/T8WCE5ldZa+wo9OxG3E4ynbrjkB/OQSRriYUip6jAXVeJHEOY5h9ax
jKk1eJzEsmg8xQ+fkUQSLw==',
'signature' => 'YQqOnv3ofHZyNTotfnGd/y9vo/YE2fbh4oAc43tllDepNn6YNw5G1VGvAaWVKHVM
pQ42vpESfE8dbP68GMt/wbC/XzqvhxumBN/IFMGuR9H07T7KMM3L+Zvx4KO3bDst
BrnMHWg/qX5cUMv3X3rE01tgUbcO7LCIj9unIsi+sw1l78eaiXWM05cMWLt6ftl0
/uuGqYXqm+ZsJZYa/p7wYofaOVwdpnO7jR7rktibmFQLT2QhTJz49ZkqmRgOTO1K
N8/z6Bz9Cxw0vlsc51+a7lieSnYu//mLEjfYYySnqWkuh1LiuQpdvtKS9QZTurOu
Lz+/hpNrcKkpGC070S0lZg==',
],
],
'20' => [
'100' => [
'latest' => '20.0.13',
'internalVersion' => '20.0.13.1',
'downloadUrl' => 'https://download.nextcloud.com/server/releases/nextcloud-20.0.13.zip',
'latest' => '20.0.14 RC1',
'internalVersion' => '20.0.14.0',
'downloadUrl' => 'https://download.nextcloud.com/server/prereleases/nextcloud-20.0.14rc1.zip',
'web' => 'https://docs.nextcloud.com/server/20/admin_manual/maintenance/upgrade.html',
'eol' => false,
'minPHPVersion' => '7.2',
'signature' => 'rHA8ivfbtttxE6+DHmTXi0P4hrJWIOs62Kye8MR5OL+qYA2M/prImKzLDS+g45Ng
idSEzwJhVwXmIHKwa44mGSfajGyK3G+hDjIPXYhXMr4K3AedA132wxS5uoH3aarc
/LPII9JXco5sPm9q4PhLmi348QlqW0x6ZecbtktC5J9XrYz5ciAJf/JD8vksvV1b
3b1uy3AJQBHNKzF128lJJ24pTA6jBF6pLx4uEKYIJ1jvDzYVQQSRBmWP0+xLQbQI
vaH5voZBDzznJb3pbP39LMBQawhP70GUocN0XMLRrDP5nVoYxl0TFRHF1qYQcszj
xct3uj209Ht7U9G6IGFpFw==',
'signature' => 'iXuxFaV/fQGUVwD35iare7UTLLcQ4lL4FBYVB+DDY0CaFlt49u31SlKR6DDy5h9T
degYaPt52qOae31s0zosNEUkr8RTQZj8jlZ6YoeUPtQQz7qnbiPsjtFuFHCMH7bc
AZ+5kZJ+W2l6EQZjIR8AEpPrNaNzyXV1tp3WMAcdHC4M23yAEi5HuatrdMr0sfG0
IgmASTkl0jGQxz+3hLtnz16VifIvKs1qHHmsIwBz6mUH0QMTKYsdjwXMiL1aYkJF
KSRCAWk9rzGwtgeZOOg2ecSyA23FrqW239ZgXdbttCMCGe7M5dI8dC2dG6k10c+n
p74hqJopw55lvxpt3jlpDQ==',
],
],

'19.0.13' => [
'100' => [
'latest' => '20.0.13',
'internalVersion' => '20.0.13.1',
'downloadUrl' => 'https://download.nextcloud.com/server/releases/nextcloud-20.0.13.zip',
'latest' => '20.0.14 RC1',
'internalVersion' => '20.0.14.0',
'downloadUrl' => 'https://download.nextcloud.com/server/prereleases/nextcloud-20.0.14rc1.zip',
'web' => 'https://docs.nextcloud.com/server/20/admin_manual/maintenance/upgrade.html',
'eol' => false,
'minPHPVersion' => '7.2',
'signature' => 'rHA8ivfbtttxE6+DHmTXi0P4hrJWIOs62Kye8MR5OL+qYA2M/prImKzLDS+g45Ng
idSEzwJhVwXmIHKwa44mGSfajGyK3G+hDjIPXYhXMr4K3AedA132wxS5uoH3aarc
/LPII9JXco5sPm9q4PhLmi348QlqW0x6ZecbtktC5J9XrYz5ciAJf/JD8vksvV1b
3b1uy3AJQBHNKzF128lJJ24pTA6jBF6pLx4uEKYIJ1jvDzYVQQSRBmWP0+xLQbQI
vaH5voZBDzznJb3pbP39LMBQawhP70GUocN0XMLRrDP5nVoYxl0TFRHF1qYQcszj
xct3uj209Ht7U9G6IGFpFw==',
'signature' => 'iXuxFaV/fQGUVwD35iare7UTLLcQ4lL4FBYVB+DDY0CaFlt49u31SlKR6DDy5h9T
degYaPt52qOae31s0zosNEUkr8RTQZj8jlZ6YoeUPtQQz7qnbiPsjtFuFHCMH7bc
AZ+5kZJ+W2l6EQZjIR8AEpPrNaNzyXV1tp3WMAcdHC4M23yAEi5HuatrdMr0sfG0
IgmASTkl0jGQxz+3hLtnz16VifIvKs1qHHmsIwBz6mUH0QMTKYsdjwXMiL1aYkJF
KSRCAWk9rzGwtgeZOOg2ecSyA23FrqW239ZgXdbttCMCGe7M5dI8dC2dG6k10c+n
p74hqJopw55lvxpt3jlpDQ==',
],
],
'19' => [
Expand Down
80 changes: 40 additions & 40 deletions tests/integration/features/beta.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,18 +418,18 @@ Feature: Testing the update scenario of beta releases
And the installation mtime is "11"
When The request is sent
Then The response is non-empty
And Update to version "20.0.13.1" is available
And URL to download is "https://download.nextcloud.com/server/releases/nextcloud-20.0.13.zip"
And Update to version "20.0.14.0" is available
And URL to download is "https://download.nextcloud.com/server/prereleases/nextcloud-20.0.14rc1.zip"
And URL to documentation is "https://docs.nextcloud.com/server/20/admin_manual/maintenance/upgrade.html"
And EOL is set to "0"
And The signature is
"""
rHA8ivfbtttxE6+DHmTXi0P4hrJWIOs62Kye8MR5OL+qYA2M/prImKzLDS+g45Ng
idSEzwJhVwXmIHKwa44mGSfajGyK3G+hDjIPXYhXMr4K3AedA132wxS5uoH3aarc
/LPII9JXco5sPm9q4PhLmi348QlqW0x6ZecbtktC5J9XrYz5ciAJf/JD8vksvV1b
3b1uy3AJQBHNKzF128lJJ24pTA6jBF6pLx4uEKYIJ1jvDzYVQQSRBmWP0+xLQbQI
vaH5voZBDzznJb3pbP39LMBQawhP70GUocN0XMLRrDP5nVoYxl0TFRHF1qYQcszj
xct3uj209Ht7U9G6IGFpFw==
iXuxFaV/fQGUVwD35iare7UTLLcQ4lL4FBYVB+DDY0CaFlt49u31SlKR6DDy5h9T
degYaPt52qOae31s0zosNEUkr8RTQZj8jlZ6YoeUPtQQz7qnbiPsjtFuFHCMH7bc
AZ+5kZJ+W2l6EQZjIR8AEpPrNaNzyXV1tp3WMAcdHC4M23yAEi5HuatrdMr0sfG0
IgmASTkl0jGQxz+3hLtnz16VifIvKs1qHHmsIwBz6mUH0QMTKYsdjwXMiL1aYkJF
KSRCAWk9rzGwtgeZOOg2ecSyA23FrqW239ZgXdbttCMCGe7M5dI8dC2dG6k10c+n
p74hqJopw55lvxpt3jlpDQ==
"""

Scenario: Updating the Nextcloud 20.0.0 on the beta channel
Expand All @@ -439,18 +439,18 @@ Feature: Testing the update scenario of beta releases
And the installation mtime is "11"
When The request is sent
Then The response is non-empty
And Update to version "20.0.13.1" is available
And URL to download is "https://download.nextcloud.com/server/releases/nextcloud-20.0.13.zip"
And Update to version "20.0.14.0" is available
And URL to download is "https://download.nextcloud.com/server/prereleases/nextcloud-20.0.14rc1.zip"
And URL to documentation is "https://docs.nextcloud.com/server/20/admin_manual/maintenance/upgrade.html"
And EOL is set to "0"
And The signature is
"""
rHA8ivfbtttxE6+DHmTXi0P4hrJWIOs62Kye8MR5OL+qYA2M/prImKzLDS+g45Ng
idSEzwJhVwXmIHKwa44mGSfajGyK3G+hDjIPXYhXMr4K3AedA132wxS5uoH3aarc
/LPII9JXco5sPm9q4PhLmi348QlqW0x6ZecbtktC5J9XrYz5ciAJf/JD8vksvV1b
3b1uy3AJQBHNKzF128lJJ24pTA6jBF6pLx4uEKYIJ1jvDzYVQQSRBmWP0+xLQbQI
vaH5voZBDzznJb3pbP39LMBQawhP70GUocN0XMLRrDP5nVoYxl0TFRHF1qYQcszj
xct3uj209Ht7U9G6IGFpFw==
iXuxFaV/fQGUVwD35iare7UTLLcQ4lL4FBYVB+DDY0CaFlt49u31SlKR6DDy5h9T
degYaPt52qOae31s0zosNEUkr8RTQZj8jlZ6YoeUPtQQz7qnbiPsjtFuFHCMH7bc
AZ+5kZJ+W2l6EQZjIR8AEpPrNaNzyXV1tp3WMAcdHC4M23yAEi5HuatrdMr0sfG0
IgmASTkl0jGQxz+3hLtnz16VifIvKs1qHHmsIwBz6mUH0QMTKYsdjwXMiL1aYkJF
KSRCAWk9rzGwtgeZOOg2ecSyA23FrqW239ZgXdbttCMCGe7M5dI8dC2dG6k10c+n
p74hqJopw55lvxpt3jlpDQ==
"""

Scenario: Updating the Nextcloud 20.0.13 on the beta channel
Expand All @@ -460,18 +460,18 @@ Feature: Testing the update scenario of beta releases
And the installation mtime is "11"
When The request is sent
Then The response is non-empty
And Update to version "21.0.5.1" is available
And URL to download is "https://download.nextcloud.com/server/releases/nextcloud-21.0.5.zip"
And Update to version "21.0.6.0" is available
And URL to download is "https://download.nextcloud.com/server/prereleases/nextcloud-21.0.6rc1.zip"
And URL to documentation is "https://docs.nextcloud.com/server/21/admin_manual/maintenance/upgrade.html"
And EOL is set to "0"
And The signature is
"""
EzWqv/JVdeINrZ/6qi55G4g9ynIoP3RPIVh9iWPsvndJZATspnhruvsXnht1l1em
5apzHR4qT9jrgrxI/3Lzd68TWSK6gWuQqRwhbLMAicQNgpTOjdDB6TL/BYsEXbtq
1Hm5magelP5aC+L141lth9g/sEAr4BvI+NSw+/BfnxPxRg67UPYYx/TY//RzfNiw
qtwt0NkL87IvVXD4Hu0qFjMv270UP6QD/qXzs2i28nbDq3mOGZCJ3EfxoX0aM1U6
k7lerNTea/T8WCE5ldZa+wo9OxG3E4ynbrjkB/OQSRriYUip6jAXVeJHEOY5h9ax
jKk1eJzEsmg8xQ+fkUQSLw==
YQqOnv3ofHZyNTotfnGd/y9vo/YE2fbh4oAc43tllDepNn6YNw5G1VGvAaWVKHVM
pQ42vpESfE8dbP68GMt/wbC/XzqvhxumBN/IFMGuR9H07T7KMM3L+Zvx4KO3bDst
BrnMHWg/qX5cUMv3X3rE01tgUbcO7LCIj9unIsi+sw1l78eaiXWM05cMWLt6ftl0
/uuGqYXqm+ZsJZYa/p7wYofaOVwdpnO7jR7rktibmFQLT2QhTJz49ZkqmRgOTO1K
N8/z6Bz9Cxw0vlsc51+a7lieSnYu//mLEjfYYySnqWkuh1LiuQpdvtKS9QZTurOu
Lz+/hpNrcKkpGC070S0lZg==
"""

Scenario: Updating the Nextcloud 21.0.0 on the beta channel
Expand All @@ -481,18 +481,18 @@ Feature: Testing the update scenario of beta releases
And the installation mtime is "11"
When The request is sent
Then The response is non-empty
And Update to version "21.0.5.1" is available
And URL to download is "https://download.nextcloud.com/server/releases/nextcloud-21.0.5.zip"
And Update to version "21.0.6.0" is available
And URL to download is "https://download.nextcloud.com/server/prereleases/nextcloud-21.0.6rc1.zip"
And URL to documentation is "https://docs.nextcloud.com/server/21/admin_manual/maintenance/upgrade.html"
And EOL is set to "0"
And The signature is
"""
EzWqv/JVdeINrZ/6qi55G4g9ynIoP3RPIVh9iWPsvndJZATspnhruvsXnht1l1em
5apzHR4qT9jrgrxI/3Lzd68TWSK6gWuQqRwhbLMAicQNgpTOjdDB6TL/BYsEXbtq
1Hm5magelP5aC+L141lth9g/sEAr4BvI+NSw+/BfnxPxRg67UPYYx/TY//RzfNiw
qtwt0NkL87IvVXD4Hu0qFjMv270UP6QD/qXzs2i28nbDq3mOGZCJ3EfxoX0aM1U6
k7lerNTea/T8WCE5ldZa+wo9OxG3E4ynbrjkB/OQSRriYUip6jAXVeJHEOY5h9ax
jKk1eJzEsmg8xQ+fkUQSLw==
YQqOnv3ofHZyNTotfnGd/y9vo/YE2fbh4oAc43tllDepNn6YNw5G1VGvAaWVKHVM
pQ42vpESfE8dbP68GMt/wbC/XzqvhxumBN/IFMGuR9H07T7KMM3L+Zvx4KO3bDst
BrnMHWg/qX5cUMv3X3rE01tgUbcO7LCIj9unIsi+sw1l78eaiXWM05cMWLt6ftl0
/uuGqYXqm+ZsJZYa/p7wYofaOVwdpnO7jR7rktibmFQLT2QhTJz49ZkqmRgOTO1K
N8/z6Bz9Cxw0vlsc51+a7lieSnYu//mLEjfYYySnqWkuh1LiuQpdvtKS9QZTurOu
Lz+/hpNrcKkpGC070S0lZg==
"""

Scenario: Updating the Nextcloud 21.0.5 on the beta channel
Expand Down Expand Up @@ -565,16 +565,16 @@ Feature: Testing the update scenario of beta releases
And the installation mtime is "11"
When The request is sent
Then The response is non-empty
And Update to version "23.0.0.5" is available
And URL to download is "https://download.nextcloud.com/server/prereleases/nextcloud-23.0.0beta2.zip"
And Update to version "23.0.0.6" is available
And URL to download is "https://download.nextcloud.com/server/prereleases/nextcloud-23.0.0beta3.zip"
And URL to documentation is "https://docs.nextcloud.com/server/23/admin_manual/maintenance/upgrade.html"
And EOL is set to "0"
And The signature is
"""
s7x3N92Y+mrFW4OPpYAHVNOgd5LW1lj4ncrNIOoICsj0eeIcz35soNV/6BGGK9iI
1C6da6Xp5a3PeL72vy5dww9WJeVTp/alhzETVuh4TT66cvu7pjZYElgCqc1FitQ2
6cfgMBnrh8cflg3LWMt1gabMOBQK/hnZgbVDlkbN721RmPStin5jarcgs9mYkvHD
uSTgRl2dJojigwOvrLxyp8yuef1fDg6Jr+rucwZq26LGsL8ZQ5G3NZzY0fNK9rHz
KGDobeM3BZVyCSVjOTdgIfTfyuoX3dXdhIE7Auh9RrI8bzKenrCjUw6QeG9P+yCC
NwRSqbNyNFgt32XNH35cVA==
a5V0gwEdnalEkxHH1UCBOXqeUC8GpXJu2lioLQ4tZLziPYrXSdumFc6Wqcl0qRnJ
9mXUmb56IPF9wpM+OVFFP3edXSrxPn7sjyIWmGDUcj4VbfJAyQYTIqK3KUSF2UNP
wQHNOPr06P1zVK1Lbj82QaxwYE2gsLp5N/jUELit6WyiAvGSf0e+p2yGuOE7H4V5
dQj/sCFAGkcdfZG444M7aAuXnmjJrhmH6WA1d1SkGJxYnnPP5Tmer2NdAy5m7tpl
DzzuOS7hHkZtR3wIA+SwPh2BWI2YpzdcZNTs3iNTMRsx6bRH2e6XAw9eu87uh89c
8IN/c1zctNQteUZwdtsSBQ==
"""

0 comments on commit 924a957

Please sign in to comment.