From 52b7f102f05dc876c99987e50dbde11907f28d5a Mon Sep 17 00:00:00 2001 From: Conrad Kramer Date: Thu, 19 Mar 2026 00:40:07 -0700 Subject: [PATCH] Fix Apple deployment env and refresh NSC caches --- Apple/NetworkExtension/libburrow/build-rust.sh | 14 +++++++++++++- secrets/forgejo/nsc-autoscaler-config.age | Bin 1395 -> 432 bytes secrets/forgejo/nsc-dispatcher-config.age | Bin 1324 -> 432 bytes secrets/forgejo/nsc-token.age | Bin 1238 -> 432 bytes 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Apple/NetworkExtension/libburrow/build-rust.sh b/Apple/NetworkExtension/libburrow/build-rust.sh index bae4727..d54bd71 100755 --- a/Apple/NetworkExtension/libburrow/build-rust.sh +++ b/Apple/NetworkExtension/libburrow/build-rust.sh @@ -88,7 +88,19 @@ for VAR_NAME in HOME CARGO_HOME CARGO_TARGET_DIR RUSTUP_HOME RUSTC_WRAPPER SCCAC fi done EFFECTIVE_CARGO_TARGET_DIR="${CARGO_TARGET_DIR:-${CONFIGURATION_TEMP_DIR}/target}" -env -i PATH="$CARGO_PATH" PROTOC="$PROTOC" CARGO_TARGET_DIR="${EFFECTIVE_CARGO_TARGET_DIR}" IPHONEOS_DEPLOYMENT_TARGET="$IPHONEOS_DEPLOYMENT_TARGET" MACOSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" "${EXTRA_ENV[@]}" cargo build "${CARGO_ARGS[@]}" +BUILD_ENV=( + "PATH=$CARGO_PATH" + "PROTOC=$PROTOC" + "CARGO_TARGET_DIR=${EFFECTIVE_CARGO_TARGET_DIR}" + "${EXTRA_ENV[@]}" +) +if [[ -n "${IPHONEOS_DEPLOYMENT_TARGET:-}" ]]; then + BUILD_ENV+=("IPHONEOS_DEPLOYMENT_TARGET=${IPHONEOS_DEPLOYMENT_TARGET}") +fi +if [[ -n "${MACOSX_DEPLOYMENT_TARGET:-}" ]]; then + BUILD_ENV+=("MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}") +fi +env -i "${BUILD_ENV[@]}" cargo build "${CARGO_ARGS[@]}" mkdir -p "${BUILT_PRODUCTS_DIR}" diff --git a/secrets/forgejo/nsc-autoscaler-config.age b/secrets/forgejo/nsc-autoscaler-config.age index 3d8df29dfe23e4c974eade24d7721b5946a22127..5ec06d7e98a6cb18f06e9a3f31274572922c90f3 100644 GIT binary patch delta 378 zcmey&wSjqpPQ9zIeo;VLrIWjhk4cH2ezI$%zfZbThI^HBs8d)~MvzIMeuhP^p{J99 zFIQ<&lu?;Qep!Y^NosPbpMSAQWUGQk9#Zg+a2bX{m2Y zlv9+Se`;7hS8{ntR7Q$nPPt)5fwoymaFw=4WL~y^nsb^_vAbt#WSDnGVt!arQIt>M z#E;_jzD_3Qg_dDH;qEyB>0yb9krghkAxKxrTuUBqtqr!kHd}uOQ@>0b XPw!=&!^Nt;i$y0YyFX(2k<0)9vdVwO delta 1348 zcmdnM{F!TlPJOa-u~(#7X<ruIOO>-Hm%dkkMOavnd!T7jhOc8qPNA2vd7xL3Wne~bMTB-%R=Q)bg|BarONoK+ z#E;_j=80xOIR)C@u8ASu5yja#rRhl)nP!3M{sAr_C7A(H`en|!+HO9D&OruT9^t`G zX&F)JSw@8g&Sq5whKbtQF6p_ELB&q4k;d9S74Er39?qWGm7ykFy1Kdw!S0cUK>>+A z0ZG|OiGjgUPL6pgnZbUMmRXtM#px*q*(q7|ZUMdp+J#k~T%WGIS;(&c%QdF%53}w} zjquGw(Y<9kl*Wmgn-2Y1BqaP_bL-7g$r)i zlU}gs$cq_wHRiWkiOeo zaJh-bzRmS(<4!oG=LbZkADPs^;GyEY$7%*gORW1V$xl8i>P%dag;o_r4? z^wmC#DAaGPeB)I8zHhV5a{+$`=7yQgY6*(P^Sd5vUQ%EFuzsER))M~O{rkQ?Y~02( z$wjOFv8R_a+rhXGVd2Y@OB{mNG@ef2<$9x}*3xL-_fmQ570>FIzRK&e4|X1x_;s}} zSvUL8yEADonsnd4p4go*>4Q5{%M_#SazCE^4P3VEaP`MO{mGfteQRgEKghjhlR|c@ zz<<8o-)z_0ny))>Ik7aZ{&?1nc+babN`~T1-RAX86E+4b{S#UfbxYz=_G4ET*0)A( zvz8>EWphg7$>rDy7%Q`JFbdDcfuG@>LHC+&`Iv#Z`R;bV-!>^V2o8744%?Add| zy{GrR!fUJWsSPe2y@8PYNGd~8djQG$}Rd#pp-k^0a z6V_Z<5f*;unA0&2!Gns-2Pb@gSn{o8MSb$K|9Q*%J*HAuEeihl{l0(H>E?n$ z?~5(E#%13R{!7xbT6)k=GxO{dhj|;WX?y+q*E=(6;i|TS7MZ_njg-#WML^3o&o?|f!_ziSD@lBYZ+oaeZ;_Y2+I`OHr1&{CI=uUdO~ zi}v=l_|H+=T4VUBTT-egW*h6%b%nwI{TE)?#~E$FBJW={iR*oH*OPm%6gK$&zEb|% zb*jOVsdxYG^u86yajh}6=c7Vv)Y_}Fzj*UKi9DS$Lz7yq(gkb-!8Bn9c_+Q#F?fVfS!%9xuYcp$HO&V5; GssjKbV{0D( diff --git a/secrets/forgejo/nsc-dispatcher-config.age b/secrets/forgejo/nsc-dispatcher-config.age index a3144309524798ec00ac0e89cbd041a6bff8479e..cd957f985c2aa89fbedf9f44c2cf352d275c3648 100644 GIT binary patch delta 378 zcmZ3(wSjqpPQ9N?rFm+qQDJhLe{o1ger8mTp<||3ZhnEbOITJwfVZ}#cBFSjZh3*T zD_4qTa8`(^pFv8dc4>H;TcLJwc5X&!vTvrjYkF>~MP)%+re$DZzN>LWF_*5LLUD11 zZfc5=si~o*f@e`wu4B4_bBIN0ZcvVAxq)d?afq=`o|{Q%k#<(3qnl@bl1r3JK&HN{ zX^>fRu}M}km#ME;N^(S5phZ@2WrT5vlSipRWVxwFUYfIaXpwhjgsXdCc8*6>c}`;S z#E;_j&MrlkW@d%qm5F6WUL`@M;pLg3KB0+bDMnryVa|!!WkEqX*@@+;?#{kk-dPrv zCV}Nu5e23Co<@aL+L2Wi#>qMQe#HUCJ|-q%1x0?vu9YDsUJ>P7y1KdwVda(v#@QhO zX2uoH`57+xCHfxTW;srYRTgDI;m+Rvl|?C<9#O6Zxk;4bv^`1l9UZWuEd93_rzEaIzKv6DWc8 delta 1277 zcmdnMyoPInPJOXyigQ$$cUquv$Ty0?WzTCjFbj$fKfK9{bYLUD11 zZfc5=si~o*f@e`wu4B4Fu0>#KSV57yyRWB5YDl?(v0ILBPI^&DsFR_-Pf(CwmWiKb zfM0oFNm6++mqCP?n@d`zp=+Xtc7bt0k)M}yW`$|Gb40dVXkdn~zNd#{QD#w6uwz=_ z#E;_j8Ad4;evzf6?jB_x=8iteS*1n+h8c;;l}=vy0b#{q=5G3>Zb^xm5ze7pX?ZE( z203M!j-ip^l@b2AZth`Dg_-U}MUh@bMVVRViFs~06``q>&IN&7y1Kdwp+#9qe)>Mz zRUUbXg+-;luBC3iE@{601!)yQ839q5u1RI}u7wf4k?C2!T&nv5rxp54ocPIQwTR($ z!7lLzt)nY$l-OB+>#g`PZR?3#CdUa^emyVT)p0bwYjQg$U#zrQNo~$8k?rm`mrduq zyujgP*cR)+SzC98Bz~E?eZSYl3tKtL3wQ404G4Cd%M-HJqhZmto(SbGtBy;$D~_5Z z_2Z^-^>6pGiBeU0yxWk~!Z_ zLwk~F_TsR^yS)FO;oc$=RV^Vp{mUNXqRsP)SID*gsXU{3cZ1nkSxZe`K(9f69#INY^=}4OrgYs6cTVk6yQR}YIe#v5Pn&)6 zvHZN%Cr)H;;+Q$-W7jFM`hELi4WtCU+^TG1ANF^wS=YyNQgov_>xCIhnJ>Rtuy@Za zlincSG_9nQCMsWJ|Lbk(@;8K;M=K(4@@1q^VUxEu3oVHiS^Sd8p&(6U7t7e$c)!JpEmc@2Y-{~ zQ~9w=(zrAuaO2XJ!|QzK^!kXLSs(OpuV3!o{W~7TPMThL?#C>XAM8aLo$u!8&lPh0 zD*a>XuXkZ~nu-heg#O+l;KtSAV6#5v%z?tE-_6%g_kGwoQ>0bTSofb^&2k}?Pbp5d z1s6NkmQAj>DB&hw^ZWAVej~?eT4oQ#)kEq(q+a@ZBJ+E~mQP;SCb2y5pTe7aXxCEH z18w}u$;Ee+J0C2&HoHshxTa>ti8cA<57J7`t^D(By6%y06;*Yy-;EWg*j}ux*fZ^C z-u9(h?tqe>oeM(izGf-3YL}i%3@m>!x6W9J zNzKN3Q?SWav)N2jmmL(obI>mMs*3vOTU^W2jej+jRu|WpwLM&6vstIr_0zAT2R^M@JJ0ZC m%!iDJwoZwUUR!_J`jdS+-@!8htG{$^&)`0-eCUu$#4!MxK1{&? diff --git a/secrets/forgejo/nsc-token.age b/secrets/forgejo/nsc-token.age index dfd1d04b253336e74f294f9b1120f6e6e5c33389..ced6518e6b98d7cdf565c706dec733cdb88823af 100644 GIT binary patch delta 378 zcmcb{xq*3tPJMB(V`Q+Io2$E_Q;MsBk84GlVQGYyzJ7Xo#NLfK;S&C_Txm!k}mtmRf z#E;_jUZ%-OL6%MhxfKPLE>2Z0m1TipIr@g>mKokj-lajVNtxv#!LA|xUb*F5Nrt5+ z?x9}3IVMSY{`%%&E+M6fDaB4%mZ{!>F3$O${%$@gNseJ=E*9lny1Kdwl?BOprGeUM zg=Jyx;Z7D+!LAnW#kmo=#(6I3S;=Jv=|%;bp(dsV+Ky5ATyt8a7rdTwuTV~QvBC@1 XZrKd&@IJxX(;T%5bDmqrcg_a@whw;H delta 1190 zcmdnMe2sI0PJMV%q)BF!V|Iy8x@&o4v75WOb8%QeWLRi^iFa;kdSO^)TC#6Qj-!59 zI#;n-k-kwxL}0j6v0qtEzHz#KcBz4(S!R%Pn0twZtD(DNQJO`GQCaM5d7iS7>@gMY(xdkb#k z#E;_j<-vvq=81{L&ORPyzD|zrep!wc?*6Xn-X3B8Az|4?ky%;h5grxp+UeO`MP3yV zMM>oq5e7+VrrF71M)@9QroqldhE*YsRYf5cffiYAVHv?eNkN`my1KdwIcBB$2HM)$ znStp}9|H%>d-9ckT|V=bZ|A2OrW?AwGj0|%O1#QEGWD)!%xkR`=DZJA9B+Q} z;zW;D?z*dmQU6N5>n}UqFU|4NY}K(dj@>D4zulhk|M?j6S7=J>5&5Urc3t2<|LieG z0+Z&wGuHL7PqeuukEvOw%v*7G-u^FVi_YA-Vm0~7)cFy6wmiADSMbn@Q|D41Pczxx z(Vr`!dn|0lI>xPsH(h=yv1b9(gk3u-ZhLMx9JsNJ)#ZfZnqKkP!u99(v^|(Q_0YPF z9d~ndmni*PY+QRazB{?Y+518gyB>p-?Na9#Z#Gp-Z|7Uw#o+Z?E=EkP@4VXg;scr=ryqKMl|9k1 z>Q`}ic;|&9U)&PPY`dj*rEb@~=e{GPl}XE?I{cZ)i3U!VRG>A&fkkYzI0rEP@lS6 z<}yQ=e#HU16@rqN{;Dl`C{&n zZsgg8-F|PlWAF9nGp|H^zwE*@ch_UzNtsuk)xY|gdC@A))T8<48Gh!l3GrWEq@2_L z({Sjb6!-F-B5fRRqQrET{S80kJhyjQQh@q|CXrK5gi`-+5e&YmkT{cNai7w!1(sKSj8`rW!xG5c-ndjJ<{BFq2)