added handling for deploy cannon in multiple extension types

This commit is contained in:
Valmo Trindade
2024-12-30 04:24:04 -03:00
parent 763c71e748
commit 51cdc30d45
5 changed files with 15 additions and 24 deletions

View File

@@ -3,7 +3,7 @@ name: Pack_beta
on: on:
push: push:
branches: branches:
- dev - action
pull_request: pull_request:
branches: [action] branches: [action]
@@ -12,9 +12,9 @@ jobs:
strategy: strategy:
matrix: matrix:
os_target: os_target:
- { os: "windows-latest", target: "i686-pc-windows-msvc", artifact: "armatak.dll" } - { 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_x64.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: "armatak.so" } - { os: "ubuntu-latest", target: "x86_64-unknown-linux-gnu", artifact: "libarmatak.so", name: "armatak.so" }
runs-on: ${{ matrix.os_target.os }} runs-on: ${{ matrix.os_target.os }}
steps: steps:
- name: Checkout Repo - name: Checkout Repo
@@ -32,6 +32,8 @@ jobs:
run: sudo apt-get update && sudo apt-get install -y build-essential run: sudo apt-get update && sudo apt-get install -y build-essential
- name: Cargo Build - name: Cargo Build
run: cargo build --release --target ${{ matrix.os_target.target }} run: cargo build --release --target ${{ matrix.os_target.target }}
- name: check stuff
run: ls target/release
- name: Upload Artifact - name: Upload Artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
@@ -53,17 +55,17 @@ jobs:
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: x86_64-pc-windows-msvc 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 - name: Download Windows x86 Artifact
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: i686-pc-windows-msvc name: i686-pc-windows-msvc
- run: mv ./armatak.dll ./target/release/armatak.dll
- name: Download Linux x64 Artifact - name: Download Linux x64 Artifact
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: x86_64-unknown-linux-gnu name: x86_64-unknown-linux-gnu
- run: mv ./armatak.so ./target/release/armatak.so - run: mv ./libarmatak.so ./armatak.so
- name: Setup HEMTT - name: Setup HEMTT
uses: arma-actions/hemtt@v1 uses: arma-actions/hemtt@v1
- name: Build - name: Build

4
.gitignore vendored
View File

@@ -67,4 +67,6 @@ pids
# Diagnostic reports (https://nodejs.org/api/report.html) # Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
target/ target/
*.so
*.dll

View File

@@ -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");
};

Binary file not shown.

View File

@@ -23,8 +23,8 @@ exclude = [
include = [ include = [
"LICENSE", "LICENSE",
"*/*.dll", "*.dll",
"*/*.so", "*.so",
"*.paa" "*.paa"
] ]
@@ -42,6 +42,7 @@ workshop = [
"623475643", # 3den enhanced "623475643", # 3den enhanced
"1779063631" # Zeus enhanced "1779063631" # Zeus enhanced
] ]
mission = "atak_test_malden.Malden"
parameters = [ parameters = [
"-skipIntro", "-skipIntro",