Merge branch 'master' into dzn-inventory-frame-noninherit-actions

Author: BrettMayson

.gitattributes

@@ -2,3 +2,6 @@
 *.png binary
 *.jpg binary
 *.paa binary
+
+/tools/make_docs eol=lf
+/tools/make_docs_docker eol=lf

.github/release-drafter.yml

@@ -26,8 +26,6 @@ exclude-labels:
 
 change-template: '- $TITLE (#$NUMBER) **$AUTHOR**'
 template: |
-  DESCRIPTION HERE
-
   $CHANGES
 
   Change log for [CBA v$NEXT_PATCH_VERSION](https://github.com/CBATeam/CBA_A3/milestone/00?closed=1)

.github/workflows/arma.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout the source code
-      uses: actions/checkout@master
+      uses: actions/checkout@v6
     - name: Validate SQF
       run: python3 tools/sqf_validator.py
     - name: Validate Config
@@ -21,26 +21,20 @@ jobs:
     - name: Check for BOM
       uses: arma-actions/bom-check@v1
 
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout the source code
-      uses: actions/checkout@master
-    - 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@master
-    - name: Build using HEMTT
-      uses: arma-actions/hemtt@master
-      with:
-        command: build --release --ci
+      uses: actions/checkout@v6
+    - name: Setup HEMTT
+      uses: arma-actions/hemtt@v1
+    - name: Run HEMTT build
+      run: hemtt build
+    - name: Rename build folder
+      run: mv .hemttout/build .hemttout/@CBA_A3
     - name: Upload Artifact
-      uses: actions/upload-artifact@v2-preview
+      uses: actions/upload-artifact@v6
       with:
-        name: CBA_A3-${{ github.sha }}-nobin
-        path: releases/CBA_A3_*.zip
+        name: CBA_A3_${{ github.sha }}-nobin
+        path: .hemttout/@*
+        include-hidden-files: true # Because .hemttout is a hidden directory

.github/workflows/documentation.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout the source code
-      uses: actions/checkout@master
+      uses: actions/checkout@v6
     - name: Install Python packages
       run: |
         pip3 install wheel

.github/workflows/pboproject.yml

@@ -8,31 +8,31 @@ on:
 
 jobs:
   pboproject:
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
     - name: Install Arma 3 Tools
       uses: arma-actions/arma3-tools@master
       with:
         toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }}
     - name: Install Mikero Tools
-      uses: arma-actions/mikero-tools@2021-04-10
+      uses: arma-actions/mikero-tools@2024-10-11
     - name: Download game data
       run: |
         Invoke-WebRequest "$env:ARMA3_DATA_URL" -OutFile arma3.zip
         $files = @("arma3.zip")
         ForEach ($file in $files) {
-          Extract-7Zip -Path $file -DestinationPath .
+          Expand-7ZipArchive -Path $file -DestinationPath .
           Remove-Item $file
         }
       env:
         ARMA3_DATA_URL: ${{ secrets.ARMA3_DATA_URL }}
     - name: Checkout CBA A3
-      uses: actions/checkout@v2
+      uses: actions/checkout@v6
       with:
         path: x\cba
         persist-credentials: false
     - name: Checkout pull request
-      uses: actions/checkout@v2
+      uses: actions/checkout@v6
       if: ${{ github.event_name == 'pull_request_target' }}
       with:
         path: pullrequest
@@ -53,13 +53,13 @@ jobs:
       env:
         PYTHONUNBUFFERED: 1
     - name: Archive logs
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v6
       if: ${{ always() }}
       with:
         name: logs
         path: temp/*.log
     - name: Archive @cba_a3
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v6
       with:
         name: '@cba_a3-${{ github.sha }}'
         path: x\cba\release\@cba_a3

.github/workflows/release-drafter.yml

@@ -11,6 +11,6 @@ jobs:
     if: github.repository == 'CBATeam/CBA_A3'
     steps:
     - name: Release Drafter
-      uses: release-drafter/release-drafter@v5
+      uses: release-drafter/release-drafter@v6
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,11 +1,9 @@
 release/*
 releases/*
 keys/*
+.hemttout
 hemtt
 hemtt.exe
-tools/hemtt*.tar.gz*
-tools/hemtt*.zip*
-.hemtt/local
 *.cache
 *.pbo
 texHeaders.bin
@@ -18,6 +16,7 @@ Thumbs.db
 /store/wiki/*
 .vscode/*
 
+*.zip
 *.7z
 
 /addons/CBA_Project.sublime-workspace
@@ -29,3 +28,4 @@ tools/ndocs-project/Data/*
 
 ArmaScriptCompiler.exe
 *.sqfc
+sqfvm.exe

.hemtt/hooks/post_release/01_rename_zip.rhai

@@ -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() + "_v" + HEMTT.project().version().to_string_short() + ".zip");
+
+print("Moving zip to " + dst);
+if !src.move(dst) {
+    fatal("Failed to move " + src + " to " + dst);
+}

.hemtt/hooks/pre_build/01_set_version.rhai

@@ -0,0 +1,15 @@
+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");
+
+let cfgmodshpp = HEMTT_VFS.join("addons").join("main_a3").join("CfgMods.hpp").open_file().read();
+cfgmodshpp.replace("0.0.0", HEMTT.project().version().to_string_short());
+HEMTT_VFS.join("addons").join("main_a3").join("CfgMods.hpp").create_file().write(cfgmodshpp);
+print("addons/main_a3/CfgMods.hpp version set");
+
+let scriptversion = HEMTT_VFS.join("addons").join("main").join("script_version.hpp").open_file().read();
+let scriptversion_date = date("[year repr:last_two][month][day]");
+scriptversion.replace("000000", scriptversion_date);
+HEMTT_VFS.join("addons").join("main").join("script_version.hpp").create_file().write(scriptversion);
+print("addons/main/script_version.hpp build set to " + scriptversion_date);

.hemtt/lints.toml

@@ -0,0 +1,26 @@
+[config.file_type]
+options.allow_no_extension = true
+
+[sqf.banned_commands]
+options.ignore = [
+    "addPublicVariableEventHandler", # Alt syntax is broken, we are using main syntax
+]
+
+[sqf.var_all_caps]
+options.ignore = [
+    "SLX_*"
+]
+
+[stringtables.usage]
+options.ignore_unused = true
+
+[sqf.undefined]
+enabled = true
+options.check_orphan_code = false
+
+[sqf.unused]
+#enabled = true #many false positives without DEBUG_MODE_FULL
+options.check_params = false
+
+[sqf.not_private]
+enabled = true