Skip to content

Commit

Permalink
General - Move to HEMTT v1.0 (#758)
Browse files Browse the repository at this point in the history
  • Loading branch information
LinkIsGrim authored Mar 24, 2024
1 parent b512cef commit 6323d01
Show file tree
Hide file tree
Showing 79 changed files with 2,886 additions and 1,067 deletions.
52 changes: 52 additions & 0 deletions .github/workflows/arma.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Arma

on:
push:
branches:
- master
pull_request:

jobs:
validate:
runs-on: ubuntu-latest
steps:
- name: Checkout the source code
uses: actions/checkout@v4
- name: Validate SQF
run: python3 tools/sqf_validator.py
- name: Validate Config
run: python3 tools/config_style_checker.py
- name: Validate Stringtables
run: python3 tools/stringtable_validator.py
- name: Validate Return Types
run: python3 tools/return_checker.py
- name: Check for BOM
uses: arma-actions/bom-check@master
with:
path: 'addons'

lint:
runs-on: ubuntu-latest
steps:
- name: Checkout the source code
uses: actions/checkout@v4
- name: Lint (sqflint)
uses: arma-actions/sqflint@master
continue-on-error: true # No failure due to many false-positives

build:
runs-on: ubuntu-latest
steps:
- name: Checkout the source code
uses: actions/checkout@v4
- name: Setup HEMTT
uses: arma-actions/hemtt@v1
- name: Run HEMTT build
run: hemtt build
- name: Rename build folder
run: mv .hemttout/build .hemttout/@zen
- name: Upload Artifact
uses: actions/upload-artifact@v3
with:
name: zen-${{ github.sha }}-nobin
path: .hemttout/@*
40 changes: 0 additions & 40 deletions .github/workflows/build.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/notify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Notify

on:
workflow_run:
workflows: ["Build"]
workflows: ["Arma"]
types:
- completed

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Translations
on:
push:
branches:
- master
- master

jobs:
update:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ CHANGELOG.md
*.tar.gz
*.zip
hemtt*
.hemttout
!hemtt.toml
@zen
tools/armake.exe
Expand Down
9 changes: 9 additions & 0 deletions .hemtt/hooks/post_release/01_rename_zip.rhai
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
let releases = HEMTT_RFS.join("releases");

let src = releases.join(HEMTT.project().prefix() + "-" + HEMTT.project().version().to_string() + ".zip");
let dst = releases.join(HEMTT.project().name().to_lower() + "_" + HEMTT.project().version().to_string_short() + ".zip");

print("Moving zip to " + dst);
if !src.move(dst) {
fatal("Failed to move " + src + " to " + dst);
}
4 changes: 4 additions & 0 deletions .hemtt/hooks/pre_build/01_set_version.rhai
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
let modcpp = HEMTT_VFS.join("mod.cpp").open_file().read();
modcpp.replace("0.0.0", HEMTT.project().version().to_string_short());
HEMTT_VFS.join("mod.cpp").create_file().write(modcpp);
print("mod.cpp version set");
199 changes: 199 additions & 0 deletions .hemtt/missions/test.VR/mission.sqm
Original file line number Diff line number Diff line change
@@ -0,0 +1,199 @@
version=54;
class EditorData
{
moveGridStep=1;
angleGridStep=0.2617994;
scaleGridStep=1;
autoGroupingDist=10;
toggles=1;
class ItemIDProvider
{
nextID=3;
};
class Camera
{
pos[]={0,15,-30};
};
};
binarizationWanted=0;
sourceName="new_test";
addons[]=
{
"A3_Characters_F",
"A3_Modules_F_Curator_Curator"
};
class AddonsMetaData
{
class List
{
items=2;
class Item0
{
className="A3_Characters_F";
name="Arma 3 Alpha - Characters and Clothing";
author="Bohemia Interactive";
url="https://www.arma3.com";
};
class Item1
{
className="A3_Modules_F_Curator";
name="Arma 3 Zeus Update - Scripted Modules";
author="Bohemia Interactive";
url="https://www.arma3.com";
};
};
};
randomSeed=10288023;
class ScenarioData
{
author="mharis001";
};
class Mission
{
class Intel
{
timeOfChanges=1800.0002;
startWeather=0;
startWind=0.1;
startWaves=0.1;
forecastWeather=0;
forecastWind=0.1;
forecastWaves=0.1;
forecastLightnings=0.1;
year=2035;
day=28;
hour=13;
minute=37;
startFogDecay=0.014;
forecastFogDecay=0.014;
};
class Entities
{
items=2;
class Item0
{
dataType="Group";
side="West";
class Entities
{
items=1;
class Item0
{
dataType="Object";
class PositionInfo
{
position[]={0,5.0014391,0.050003052};
};
side="West";
flags=7;
class Attributes
{
isPlayer=1;
};
id=1;
type="B_Soldier_F";
class CustomAttributes
{
class Attribute0
{
property="speaker";
expression="_this setspeaker _value;";
class Value
{
class data
{
singleType="STRING";
value="Male09ENG";
};
};
};
class Attribute1
{
property="pitch";
expression="_this setpitch _value;";
class Value
{
class data
{
singleType="SCALAR";
value=1.02;
};
};
};
nAttributes=2;
};
};
};
class Attributes
{
};
id=0;
};
class Item1
{
dataType="Logic";
class PositionInfo
{
position[]={0,5,0};
};
id=2;
type="ModuleCurator_F";
class CustomAttributes
{
class Attribute0
{
property="ModuleCurator_F_Owner";
expression="_this setVariable ['Owner',_value,true];";
class Value
{
class data
{
singleType="STRING";
value="#adminLogged";
};
};
};
class Attribute1
{
property="ModuleCurator_F_Forced";
expression="_this setVariable ['Forced',_value,true];";
class Value
{
class data
{
singleType="SCALAR";
value=0;
};
};
};
class Attribute2
{
property="ModuleCurator_F_Name";
expression="_this setVariable ['Name',_value,true];";
class Value
{
class data
{
singleType="STRING";
value="";
};
};
};
class Attribute3
{
property="ModuleCurator_F_Addons";
expression="_this setVariable ['Addons',_value,true];";
class Value
{
class data
{
singleType="SCALAR";
value=3;
};
};
};
nAttributes=4;
};
};
};
};
31 changes: 31 additions & 0 deletions .hemtt/project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name = "Zeus Enhanced"
prefix = "zen"
author = "ZEN Team"
mainprefix = "x"

[files]
include = [
"AUTHORS.txt",
"LICENSE",
"logo_zen_ca.paa",
"logo_zen_small_ca.paa",
"meta.cpp",
"mod.cpp",
"README.md",
]

[version]
git_hash = 0

[hemtt.launch]
workshop = [
"450814997", # CBA_A3
]
mission = "test.VR"

[hemtt.launch.ace]
workshop = [
"450814997", # CBA_A3
"463939057", # ACE3
]
mission = "test.VR"
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

2 changes: 1 addition & 1 deletion addons/area_markers/XEH_preInit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp"
PREP_RECOMPILE_END;

#include "initSettings.sqf"
#include "initSettings.inc.sqf"

if (isServer) then {
// Unique ID for creating markers
Expand Down
Loading

0 comments on commit 6323d01

Please sign in to comment.