From 51cdc30d458ec23462f589a6b5d955e175ce48fa Mon Sep 17 00:00:00 2001 From: Valmo Trindade Date: Mon, 30 Dec 2024 04:24:04 -0300 Subject: [PATCH] added handling for deploy cannon in multiple extension types --- .github/workflows/pack_early.yaml | 16 +++++++++------- .gitignore | 4 +++- .hemtt/hooks/post_build/grab_extensions.rhai | 14 -------------- .../atak_test_malden.Malden/mission.sqm | Bin 0 -> 4248 bytes .hemtt/project.toml | 5 +++-- 5 files changed, 15 insertions(+), 24 deletions(-) delete mode 100644 .hemtt/hooks/post_build/grab_extensions.rhai create mode 100644 .hemtt/missions/atak_test_malden.Malden/mission.sqm diff --git a/.github/workflows/pack_early.yaml b/.github/workflows/pack_early.yaml index f4357c0..265a68f 100644 --- a/.github/workflows/pack_early.yaml +++ b/.github/workflows/pack_early.yaml @@ -3,7 +3,7 @@ name: Pack_beta on: push: branches: - - dev + - action pull_request: branches: [action] @@ -12,9 +12,9 @@ jobs: strategy: matrix: os_target: - - { os: "windows-latest", target: "i686-pc-windows-msvc", artifact: "armatak.dll" } - - { os: "windows-latest", target: "x86_64-pc-windows-msvc", artifact: "armatak_x64.dll" } - - { os: "ubuntu-latest", target: "x86_64-unknown-linux-gnu", artifact: "armatak.so" } + - { os: "windows-latest", target: "i686-pc-windows-msvc", artifact: "armatak.dll", name: "armatak.dll" } + - { os: "windows-latest", target: "x86_64-pc-windows-msvc", artifact: "armatak.dll", name: "armatak_x64.dll" } + - { os: "ubuntu-latest", target: "x86_64-unknown-linux-gnu", artifact: "libarmatak.so", name: "armatak.so" } runs-on: ${{ matrix.os_target.os }} steps: - name: Checkout Repo @@ -32,6 +32,8 @@ jobs: run: sudo apt-get update && sudo apt-get install -y build-essential - name: Cargo Build run: cargo build --release --target ${{ matrix.os_target.target }} + - name: check stuff + run: ls target/release - name: Upload Artifact uses: actions/upload-artifact@v4 with: @@ -53,17 +55,17 @@ jobs: uses: actions/download-artifact@v4 with: name: x86_64-pc-windows-msvc - - run: mv ./armatak_x64.dll ./target/release/armatak_x64.dll + - run: ls + - run: mv ./armatak.dll ./armatak_x64.dll - name: Download Windows x86 Artifact uses: actions/download-artifact@v4 with: name: i686-pc-windows-msvc - - run: mv ./armatak.dll ./target/release/armatak.dll - name: Download Linux x64 Artifact uses: actions/download-artifact@v4 with: name: x86_64-unknown-linux-gnu - - run: mv ./armatak.so ./target/release/armatak.so + - run: mv ./libarmatak.so ./armatak.so - name: Setup HEMTT uses: arma-actions/hemtt@v1 - name: Build diff --git a/.gitignore b/.gitignore index b9b3e78..19a030e 100644 --- a/.gitignore +++ b/.gitignore @@ -67,4 +67,6 @@ pids # Diagnostic reports (https://nodejs.org/api/report.html) report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json -target/ \ No newline at end of file +target/ +*.so +*.dll \ No newline at end of file diff --git a/.hemtt/hooks/post_build/grab_extensions.rhai b/.hemtt/hooks/post_build/grab_extensions.rhai deleted file mode 100644 index e257bd1..0000000 --- a/.hemtt/hooks/post_build/grab_extensions.rhai +++ /dev/null @@ -1,14 +0,0 @@ -const DLL_NAME_32 = "armatak.dll"; -const DLL_NAME_64 = "armatak_x64.dll"; -const SO_NAME_32 = "armatak.so"; -const SO_NAME_64 = "armatak_x64.so"; - -let dllDir = HEMTT_RFS.join("target").join("release"); -let dll = dllDir.join(DLL_NAME_32); - -if dllDir.exists() && dll.is_file() && dll.exists() { - print("Adding x64 DLL file to Release"); - dll.copy(HEMTT_OUT.join(DLL_NAME_32)); - HEMTT_OUT.join(DLL_NAME_32).copy(HEMTT_OUT.join(DLL_NAME_64)); - print("Added x64 DLL file to Release"); -}; diff --git a/.hemtt/missions/atak_test_malden.Malden/mission.sqm b/.hemtt/missions/atak_test_malden.Malden/mission.sqm new file mode 100644 index 0000000000000000000000000000000000000000..d7ffffac9cffd732e54f1ee8307355238b529b79 GIT binary patch literal 4248 zcmcIoU5F(|6+YGb<7Q)i)R%n;ULlYNH@h=Cx=S=>_s-0nb!29D$n1}x(p%GAb8qc- zcQw`3Gr4d3Vo-!6Ec>$Jd!8bwBoG3-FCi!h8OJZ)PUf zfCDqsIdx8*@BCKvkdBZ4hu3vDtw$s4^`J7X86lk^{uf(ldGNS%|Z zA~3IoP8BXpWfH550vX39D`-D;=fZ`7v@&uyEL;k|rCdSG?P?3Mx3&AF%eefaj< zMC*~tq}9gDU)T@$tGe*6X%ODsLqeoxOP#ekUUw>o$o11g$gH2-<=r^^^b{PnExMt0kj+Lb!v*ZGt zwvt}JntdZ7f=oT-mKPCD@@(24asa4-haBh9moRaz<%amNAC#goS74Udg<}gl{H#n2adq9 zkJJGXXn^Eg;)n6h&?Sb&%USwevphjp_SM`u`U93;d%vJ4kwxLlWXD<%#7U+uQrwyA zZ~{AzcJ7u;2dV5VB*qO8T7*xQZeT3Un}JHT>?~)fD-@UBQrIkQLIdaW;%mo`Z*OlO z3RPxU92IFV}^M6|g`mvU1aXdgDGYlg9757%olN?77t0|X@v8x5Cw#7D8?wgFw7PCfdv=*EVzv6-Acy{Bknq9^#;%t^f#OZYcaS) z{@|c7&M~NsuR@C@=}^ne`Hib8!r5!4K&nl)oNXF<7m{tuBG^nMLd<5{b|3ITgk3)f z$uaKvaEWuGY`CT|7|=enP!`UlExZpy&m#$VQhK`>ch}zhs3*?d_X{V}-5E&?=H6fHOOxb^i5PcEN3 z3!%#XD(=piQ$29JZW~3eT{PG!1i;|;CK0>>i$0u<{|!BXV4=IxeG&<6B5?h**Q(0+ z6D#$(dq$PoOLHWwDOG2FI+}I#3!I#M#yI9A0An|5?S0^X(!;*S7Hx<{c&|B zE;jUdCO%e)Uguz?YE8qs4~GN#8KvEs-rx*uy|XA5yt)wBjND9 z^$Zm4k?@np5ZUiOi;?hKj0Bd!6Sx(-8_XHev$Viddqkh0gZH)RIeK-B{t7*Ne|!I{ zbn<~VeUknP8t=Q&i3RZ(@lVpR+%zxX%0-#$P-nO;@QMs`WBGBiQ}15Ft55{vTFsK9&X($Xqlt1KobwLWd3>m$$Md*8(NWj`-Sb-00xk<>{d;SA(2dG2z+VGU zpNSgyI}JSne0&(m7?&>|yH?`MrqZ9*g&c3%ZDYCFr;dBAvWp8pMB(`2sa?3$(0jTt z!r@h?MUSsDzGeOg@U_M+*n22)U+6XViw(Ue_N%5ZozCR34Lq;W+Wd~hx;kk}SEhGi z7wClk^F3KZf3TtVgl_N=>$RqY8REKkCNjzNctH}sw`XDc0e_g^9l&x8N~ literal 0 HcmV?d00001 diff --git a/.hemtt/project.toml b/.hemtt/project.toml index 211a3d1..96117b7 100644 --- a/.hemtt/project.toml +++ b/.hemtt/project.toml @@ -23,8 +23,8 @@ exclude = [ include = [ "LICENSE", - "*/*.dll", - "*/*.so", + "*.dll", + "*.so", "*.paa" ] @@ -42,6 +42,7 @@ workshop = [ "623475643", # 3den enhanced "1779063631" # Zeus enhanced ] +mission = "atak_test_malden.Malden" parameters = [ "-skipIntro",