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 0000000..d7ffffa Binary files /dev/null and b/.hemtt/missions/atak_test_malden.Malden/mission.sqm differ 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",