From 9ffa76fa743d9263c233523894e8b7487c9b2cad Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Thu, 2 May 2024 17:07:51 -0300 Subject: [PATCH] Fix ESM build --- dist/amd64.tar.gz | Bin 1509 -> 0 bytes dist/arm64.tar.gz | Bin 1570 -> 0 bytes dist/index.js | 7 ++----- src/index.ts | 5 ++--- 4 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 dist/amd64.tar.gz delete mode 100644 dist/arm64.tar.gz diff --git a/dist/amd64.tar.gz b/dist/amd64.tar.gz deleted file mode 100644 index ebd687670f004fbb7af4089ecc408afce8d05933..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1509 zcmV9z{O0MI1})Mo}bOA7e~7 zrmjOV!<@ts;a-HfVbeRZ1(gcow^kwPT4QPt=7K-dMvzo1AC$ zO~CIL8CUsg{)?97e6(u}7n5TXtK13`o@#jqS5)Rxq%6xNa%`@bP!jE;fW9?-z(1O8G^3+VkM2e3! z=VPf&y~y6%ec-R3tE>JcFPrPMEE1JU-H*W(s?^k^>KpK!HU&s>$C|4A0xsR|Eh6SJ zE1CrlawE%2o?4-eR{%m#nQSDrLeJpoj9=8!))P*d8~T(GFi?*$kt9MAhftTfT)MU$ zId0?$SJ+PCdqPl=)HWQ^MBpd^GbdEoG3?}hkye@1R+v|5x?}xXlpkTU`)YBLgWQzY z(?aD9_iORpT`@Pxf2dR%-x7brBbhFinl*Z5K!Id={{Pc3tC5zT)LJ3nXZyRnn0}A; zM(;kLTB>0X;3OtNK$tH`6mSx7oJ5HT9Og;S^%>!Q489mn+ZVo!d?yxyIb1|u6iMGh zDo6dJ!S4RsK`)Du)vEMHRJxShNVscJOzkeAT};O$2r&yCr$_97__l-n-)eak;v=a3 zr7X1q((s1U!#xIfCaRVxXz0n!Cj?2?#$$>@#zIPa#CJhZPC#pdi$~8Rc=J}hP*23Y(3jcNT%V`>y0$@6R&us;^I3-N9h$yq<5#n%u>3%o{)XkR=T>H55(VhLm8!g|{XufgLYT;!-fG+uj5TE#xF%UC^ z>EYH1w*LR=_W%6;5A|&J(EhPaTl?Qk|3}ri=5y7+`l2eR?E$nsfd5zz;PJw~ZKSpu z_cb)`k-q(%x_q{Y_}^6ey*h?IHU6_t>p$W-ZX5qM0n0$~71wCa-+lD_31)P4{!k0n z7{c1~-vn%L3@6s>|OT1L}O zr%6J4{kha?T6Yr3PFpLt&_W9>{Ffl(xk{iqTjzgV&&vNk)Bm^a``?0a-TrU;e;a|5 z8*6XTps>7`_%9%opht3AjQK_L%{N|USKT@T(vVArDa^E~OWZf}@5J!n%N3&5+3c*% zR@Q_P&Pppt1(noW|B(F?$9ri1u1i|`-%S7iuPn6g*)5Fp1-=c;X0184&_W9>d~5J0 L4GEfQ05Sjo`hp3Q diff --git a/dist/arm64.tar.gz b/dist/arm64.tar.gz deleted file mode 100644 index ec80ff8a68f9dd60fe250605886d29564a9d31de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1570 zcmV+-2Hp7|iwFSXtZQWg1MM1JZ`(F7&;AvJ`p^xCZIUAO1@s|Hyd_wh6p7cNYl4EJ zsFjo7k{!ow*EUTPW8HKQB6*@n-tq2ucj92U_2_^x4mn3{87xXn*`izm zB8>Yqqygm&VM4-?ZXv$40hn1QYFNs7EheIrpX>+S^8E8eHgv4Y?*sOs>zptTUo)UIKovDup(; z?cc1b7quPdgq)nXOdBuBMPbz%u9~@zk*cm&$g#Ux)sLpiygyFcIxnhiUvcn7%VOF?isOAOqv#tV8ZhKR0&Y|e{ZxESKWz|l2V4SKi zMByd=nh^vh=u)+ux<${ScPY*rZrh2VJV+u+2&iXBxXg2@2qQG$fl#13DGSn22GVDF z6iP{D-e_=2bBWU&l$=oMXRwl2RWU1-^%65Hif!-rs(uHH-P6mR92r+%O)G6$>hDB% z|CYET^V3Wh+0Ee3MXHMBRP$D@90-uA-~Rt3%xk%2Cyi7{cs%*RRMQ{P?$OKFsNrf7 z$2iYO91|W%lE#9>0_SNiW5z=j1`#JB%D@uCZbvdwX~Z%qITJDs(^N$v(gqEWM>~5j zMuRd#UMJEU5$Re9r{Jwe;pplU+Q)QE;so=Au>tX868Q{Ae>D86)AW;B}Vliz7Ty}k%!k0JVh58aLMGK7%$H%W< z9vvKx(VNq+qWjc4gYi{4bysf-antm1K%Nv@3KCSL-gjJ6UB^1 zGzMw7%S8L5o#*5I-Tl$-ujq6J4oGkf41wuSJ#&hJC=2g39Pk{{2k%t0k8kbkexX4cq;x~g1m8~fs}rj1^=MA=5* zb)LV~nQgRgsq8H0T=;1m^DtLLMKlmRXTIPv4KkK;P%g@`VnR?@O%!E*mdQN!W07J` z!oWM5&$l{wDF0uAG)07vh(wBWUx9duESC{UGZEz~$Y2|Y$VDs~t)@zdh=y^Hr<{d> zilgBJ#(z!Bfx-WWsKf8#zs>A_t)`XLV8FDpj~4%bF8;%Wg=k$C0O5zci~lwg|78js zw^AE8O8U*|ZzsBJEO`Nl##i*d)j)Xjd9O3H|62Voh0!_e^q2EEkEQ>@MSQ??Ezw;PV~Bi82=Ftv9fYGr>PR>kQ83 z{J$0B@2UU%WB-q_F8{k3SVeV@`~L?A0lV4n4@-hM-CFHG_O}`g*|h)n5JavM_np8K zw0CQv(V@OX2L?D&6sk_pUYo5#Ct$OCPkK+#c%m(8vld7<2|T1OwRIM`3KdEiRGFJk zghc{P>q;tXk)2IdeW7htqrWD~z(DrOI#p&!Tl3T*aUpae(n1Z;$y7<5YY7X0IgC># zQyI$PORI{!KdIom4E>_r{w#%YcBIplv8bLI1Lp{uS#8djYv^m!U(^Qe;!l)H(8Rf^ zO@_mB?IyEyAggk?M*m5>EZZi*^bH&OqMZcwdOsf@y+Bsh!pTXmx1L!;Uzt(tEz(}S z-g{Z89s=n1^)i$CjF&5%TVzq6`F4qF2e@ng7TqLp(K3UJZd15umBa1z+Kka)xZqkd z)>_u5J5f96po0!N|Nnje|6A{W(9q|%_dnnTralk4_ zu{!{t{;}U(r0OK@F(mF2_x9HQ%g;A+{=XU>pBx+=-ar43vHwB-&kr%{&i_pS8Q{(d U?x2GXI`|*L-_Sah^#C*g0ORBoQvd(} diff --git a/dist/index.js b/dist/index.js index 5046ef4..651f17a 100644 --- a/dist/index.js +++ b/dist/index.js @@ -89417,8 +89417,6 @@ function firstString() { } } -// EXTERNAL MODULE: external "path" -var external_path_ = __nccwpck_require__(1017); // EXTERNAL MODULE: external "node:util" var external_node_util_ = __nccwpck_require__(7261); // EXTERNAL MODULE: external "os" @@ -97270,7 +97268,6 @@ function mungeDiagnosticEndpoint(inputUrl) { - var EVENT_INSTALL_NIX_FAILURE = "install_nix_failure"; var EVENT_INSTALL_NIX_START = "install_nix_start"; var EVENT_INSTALL_NIX_SUCCESS = "install_nix_start"; @@ -97701,8 +97698,8 @@ ${stderrBuffer}` "Configuring the Docker shim as the Nix Daemon's process supervisor" ); const images = { - X64: __nccwpck_require__.ab + "amd64.tar.gz", - ARM64: __nccwpck_require__.ab + "arm64.tar.gz" + X64: (0,external_node_path_namespaceObject.join)(__dirname, "/../docker-shim/amd64.tar.gz"), + ARM64: (0,external_node_path_namespaceObject.join)(__dirname, "/../docker-shim/arm64.tar.gz") }; const runnerArch = process.env["RUNNER_ARCH"]; let arch; diff --git a/src/index.ts b/src/index.ts index 5b8a326..7295bc0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -6,7 +6,6 @@ import { join } from "node:path"; import fs from "node:fs"; import { userInfo } from "node:os"; import stringArgv from "string-argv"; -import * as path from "path"; import { IdsToolbox, inputs, platform } from "detsys-ts"; import { randomUUID } from "node:crypto"; @@ -559,8 +558,8 @@ class NixInstallerAction { ); const images: { [key: string]: string } = { - X64: path.join(__dirname, "/../docker-shim/amd64.tar.gz"), - ARM64: path.join(__dirname, "/../docker-shim/arm64.tar.gz"), + X64: join(__dirname, "/../docker-shim/amd64.tar.gz"), + ARM64: join(__dirname, "/../docker-shim/arm64.tar.gz"), }; const runnerArch = process.env["RUNNER_ARCH"];