From 9c832049cdcdbb97093fe396aa141f51b0bac155 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 10 May 2024 13:31:42 +0200 Subject: [PATCH 1/4] fix: Add further files which are going to ship with Nextcloud v30+ Signed-off-by: Andy Scherzinger --- lib/Updater.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/Updater.php b/lib/Updater.php index 37d112d1..1833d070 100644 --- a/lib/Updater.php +++ b/lib/Updater.php @@ -212,6 +212,7 @@ private function getExpectedElementsList(): array { '.', '..', // Folders + '.reuse', '.well-known', '3rdparty', 'apps', @@ -221,6 +222,7 @@ private function getExpectedElementsList(): array { 'dist', 'l10n', 'lib', + 'LICENSES', 'ocs', 'ocs-provider', 'ocm-provider', From 93759a77d3f006c8c5abb12a90ec0c550617dcc9 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 10 May 2024 15:03:33 +0200 Subject: [PATCH 2/4] build(phar): generate updater.phar Signed-off-by: Arthur Schiwon --- updater.phar | Bin 1172792 -> 1172816 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/updater.phar b/updater.phar index 3e760b1bd4669b4725feebfedcb7caa81fbb8e27..f2d8d6ec4d420dbd681ebb7bc18706d10e65a067 100755 GIT binary patch delta 7938 zcmZ8_349G#`~S?{X6`yOxryw_O(LsEZbW1uix8oNsMb=uG}Wpluk}TdYD?|m;HV<0 zj-?c_9=lLlwJXYNO{rZYX#Yj4e$Sb6ueN`mk9_Z(=Q+>*Jm<`8KT>$=NMS{#EhV*o z|Fq0^($bn`l+In7`tRp^um9^AwdLQm`v>Q|bCKh?*U#SCrlS93L%*1%@J#6xefk_(t)dY*v6_rcz%gQjTBV{7o5$l}21Qgj6Jw^hf9!j` zRJ1O;k;a^4;5gSgQLmz1S*hB}!5ohJHm&_w6*bCfuB|Kpfg>+PoL5n3whJZe&B&1> zYm`I_$L%1+1DH-z`T)S2I$yl>@-jZNOo$b4FHF z2DS5h8^^_GwCw7Y30t_N0mJ^AJYslBa=T7RW$%``V2!d;{H*8TXb426FLGx(HIYN~ z99L7GKMP#XVoIKa;dK!isVXYYY^d>Uw{u){*Jlibm(gXgkZmsWyq(nJQY9(?VO} zjU0D#Zo3o}wa*Pw@+z1timz`=?x~{STo#~eu>IFYl{G5*DmPx+=`eHLswa77NUbqa z3%VY7rltz<-T-Bw&bknEf;Xd+e>PCId+emxCpGmC6}8i~(IhQ{m7I!OlU1~a&(T(7 zuyfGOJ4q^J<}&zM31U)I;hhh2rpmkAG58kyM~L@pd%F zjrwZiUFg4NG>n0$#%A_p;v^VCcTs$hc-RNJ$M&XX;(X9O`{Z}gUK6_`#pJ@p*}N6) za5U8f4>R&y$&JK4DhhM-)K*%jaonu(7giPJ*-NyQ@ryWa)1cCwDyp{k*H&({hT1>h z>MX5{*4oNBP##sb76!z=$RJeK)CUFJu_>!3Fw-cG4@&BwqO!DHjlX{s^i$$@;Lyxq z%HJ?-@UStZ!&~(qQA(@pQeU=_;<+2g-uAMkX@33i4#(Z`DgMptS3dX^jHEkel$Yj% znl)vO-XB`y)(6)&(|AO^qSiO{*9^!EfO7v}TzeHgax#OLq?!Gw?yjLsH^uFBLt3zc ztF1R8hwRYy4uJf;re6${eg05V5}Lg%LMiYhoMJ|og%4=Lvo!W6z+V1?{DF#GW;V`C zoX{2f;;yi!c_<2aW;!3D9P?z7A`zf|hr6GIQ){{N}IXuQRyaU`X{ zD4AS5iX|27fc^eTZ*YfNK=Ht&OBE_=2`PLiddA)R92Ysh<|d6AT@~=3>Aa$}ZNfHD zobux6*D9(qv!m$CP8>IEq7~|mP6(>x#Wf4+E3z~#05`i$UIcYjBzdVWrIp77ik+90 zl&I)Ml9vh&iUFGW=W;=E;+llN_vT!2DV;reqS$cmPv`!2Kj(@CFHs;5U7N&sR)QQKzs-6c)|~S_-U=KANvjC-p0#B8=-lq)RSQnIu&BqWXyxx5t%RrB74;q zgyb+Ed^~`U4qWG{Zi*AeEqLe^lK)R33rC6$R30K~f_i~@5sim}J6_{YhOydB2QzaQ zbcLA8F>Ijx1jj?;^s_KCd&R_~&G9Uz-NF4)pNxUSmsX=YPC``)My<>L9Kl?onCRDj z2#tCqI(1k;{SJxf?jgGp5W+Yp&e<(praAUfA}eboqfQCIn)R>2 ziB$MF4*H|Y3=^hNsJ41ffSz2R3t6s&f~FRQ#j~R_08Y}DCr5VE@=7hi#!%>-aWE@r zt|+E%{R?iPOBz!%YCB_$He2o zVZ4v>w1|-?-Y8$bk`5%zM|?Gq_f>X7_~=fG-TO?q_AlY+@?lXa@FbPulSlnmFlU)t zCN0qUzDx$il7hJ(zfv(Tfwk#<*y_7`sXxtJo))8y(AH;Xw}t~pj!DAt5xiY-dh}3? znZCx(4nnHumu~}=lW-}dc2eB$oB9Slmx9o#z)-X#(5@XB7O32)Jr^E%i>^7^7#@nR zn&3`zBQR8B=?E2c=GmDzFH1`=ORRFiGjAw9BwY}z?3#ceJWJq1l^Tz66jSHk?F3iC zsAwiUE67K4i5C5UwU=g4QY5P0WJOgQEy%UepiG5sp|(@}`2A?D{Taup&5E)whEXY| zCC`NP(os;oDI#!9Fr!fX@LALGUb9(GG7bJpV~=SR-P4O2vc9I&q)k4`@diu=#oq@7 z8?s`3>z3#U~FDR&%NzSUtkZ9OBDTrf6w%~6h$Wlwj}d5rN5_|C{Fyt z(T^U%kti=(Ks77P=u&uy7VRR))0f-cPNRdPgSJut10%cbUh+@=2<1Ag(%4g+`iXlC zYhvoZ>^7pW-C2|5i_7oODru>$T!fX$^%1G8E%HtasQRRj@}|cGiunZ%ud<1l zciMsWoigEySl*yyc*=|7-Y#^eJ#uDiBK>?gZkjPIfE66u}S)3QudtjS6V zFP+a+@)0n&)@jhJ5@3S<;rJ=82gw zm1*JRMT_{jo|hDxAJa&2Xy2!;Y4CEjO5FxFOkQ$&zqe8oV1z}WNm1-&$F~@+&7UqG z_(~iawnjqL(agepP!{%9!#1>M;?elE;mR7%?4Vd!daH;T2WFt^hU|Fl8UY7%_Jxj~ zSOcYQb)b^%$qmJ$k?%nlddx?EHDsk62f9|yKfah%-rfr#fxSGHO!01n&q%KaY?`eP zHlq_k>;R>oOE!*71D!2{*?Vdh#5O&?|5H|m>w^Vck-|&J9n2h?4$Zlv)g0)XnZcd3 zFl~XlJ-zC}Ca)4W4B#45PAsTsN04IlxJ@y+boO9oB&A;7;iIha-25nZDe5qX-A&3# zj8fz23W~oa{Gp?xrX#Cz;LY!_3qBrbZ*MSOKpK`6zJcmQXxC8u+*R4in+lfiydx$wtg%Z= z)_c&gzxjXmik@P@RpB|`D zc0!uh4e5S>CY60bnG3F#Hdo$aFRSJ0K4?xe_T7d~ot3tEk5%+e`fJ+mIq+@j%A{8C zYSt-?$$gmSt5J5tNz0Gx4>uh8K18M5Z`MGg+y*IINBcilQLZ5v1w8XpBzVK2K2mfw zSp)OG+>og8ro$_S<3G7@Q<V$;wD-01McTLKqqezp7LqJ7(+<7U%TDII1{BOW;ya znzMX$2X6wS(0+qc`(pWgngx~XS(lFK$#Hwy^>nMqW?-Mm{{9Lo=iR~Mbdo}Lek*-% z$Fmmkak#ZXnTEPec@1CfDZ5BQ54plfVt$jG8SuSgF$g<)@GmxxF6?8#)1%}7G9z5h z&%};Jd<%S1uXIO_r_Je)R^;br@&+>r7%C_5IK-e>(Y}heaHrlNvQ1z4TL&(CAqC)5 z^>Syj^p5<2NWL5<@9RryZ^`3%ESJev()Xl1!k=8LmkSLz=YLXLvhjtqT_W4hN+%3t zlwJPRMrE`l_<`gr;TaDk8=3MyslT4A{X=@rliQc2u@au}h2q2y%u1Y+ndDA#H%@Cj zFta2hwTZiFEFQ94>59iXlu%N)R!PbvhGoj<29mr?0U2FH1?;daQyLPBLkSBq4lf-w zq7?VdQUY;ioYGtD(5_WM$1Vk3$ecKZAB%U}m5!v+qWJ4^)&?aEPrPJmgzL9j8sOQt z%pwU{sSGw^>rmN77A@kR>Nbl7UHQ#V^JD|Q(!_EbZ#cjw;dhSl0r=%n-b8AT^1&8- zsjHi11NaZ*7`$qEe9RHV|iSIMOB$515Q>SPGKhN-FPoZHYKh@aF zNQ}Kqy^Z+TPX-^dKgQTPjg+)Abhv`=7K^vZ$pS+ik1G$`Z@;q2OnhqX+a}<#157?R zZ-B#!)B8A*$;J}N7>OO@90IQXRrkk+ceF<%%3~mRIkVGdpakn{ZZG?iRTE0T%t1?h6fQ?z0m@1xG4Hzd9cnx zuHV$(3B@%V^dFJ^qx8BmTwW(Oz_O&1aeJ59i95vV<4DwC-JU^2zQ`9e!Fl&|$LUrl z85yfTQiSvFnx5ba8J_=JtUDUC@Lipqd@1X`&&B=j>CEJ$U3XZg{lqQ_p5L|UntP%= zJlD|M^pC(y2shM*)8{CB;;yZj7Dv;C@0wj?NQ9+>3GaPmbCBv8Vw8z=&k|0^cpoyE z@!nQq1g^PfYJ$ruB^fV!Yzx4l=L8Y2J7h}46?3g3Ng5%xb8dTGT;w9xfZKt?K7>z0 z6Q_t4GCEgmZ_u6zJU2ArdV@8V)W%xA5%Hwu)-b9gnDqP1nr&X_GH<1i7ILDgC3^%s zcEG0&n`3Z4!4k(*?ujxtA~8YM_QCk#7K__MmPH9)%@VTd9|5o1W+@@Fv#o~;$)FY1 z*X)`a@G=0`Z!A3i)xz{wAX74_`owzIjB8t1TQ7783S|r;aGf2j}tKrVo(iX#9}0AJWqUSAY&Jc$Bo2QZGU3H)xVj1$#<*8NPk?-+rqK@ zg=oVW4{X~>;uqp)0_& zq}@u={4DdWxZhT@mE2J*`FbkciichhOvHK9To8dznJksGV>%KDz>f+6`Wl{mDp0}M()e@f zsgA(CGh{59&8Jd{C|5TvPFOPkQl5GKBOwpHtGTiT}BepZWZ`l<)HX)Y4TJ MxRP>(`9=Bv2jdC#fdBvi delta 8141 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 L#e}ZedD;I1jI-P( From 47e21c507107387db4215afda6de296ae27f7190 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 10 May 2024 15:07:25 +0200 Subject: [PATCH 3/4] build(web): generate index.php Signed-off-by: Arthur Schiwon --- index.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.php b/index.php index 69c1d161..31cf1f7f 100644 --- a/index.php +++ b/index.php @@ -250,6 +250,7 @@ private function getExpectedElementsList(): array { '.', '..', // Folders + '.reuse', '.well-known', '3rdparty', 'apps', @@ -259,6 +260,7 @@ private function getExpectedElementsList(): array { 'dist', 'l10n', 'lib', + 'LICENSES', 'ocs', 'ocs-provider', 'ocm-provider', From 93ffd7a4afc86525a21775abb9d2c3be44b020bd Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 10 May 2024 15:16:04 +0200 Subject: [PATCH 4/4] test: adjust PHP matrix against NC master Signed-off-by: Arthur Schiwon --- .github/workflows/test-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-master.yml b/.github/workflows/test-master.yml index 24deeb59..b2eb56d8 100644 --- a/.github/workflows/test-master.yml +++ b/.github/workflows/test-master.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ["8.0", "8.1", "8.2"] + php-versions: ["8.1", "8.2", "8.3"] name: test-master