diff --git a/.github/workflows/arma.yml b/.github/workflows/arma.yml index 9f792f709..af038e479 100644 --- a/.github/workflows/arma.yml +++ b/.github/workflows/arma.yml @@ -46,7 +46,7 @@ jobs: - name: Rename build folder run: mv .hemttout/build .hemttout/@acre2 - name: Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: acre2-${{ github.sha }}-nobin path: .hemttout/@* diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 238996633..e617afd3f 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -11,6 +11,6 @@ jobs: if: github.repository == 'IDI-Systems/acre2' steps: - name: Release Drafter - uses: release-drafter/release-drafter@v5 + uses: release-drafter/release-drafter@v6 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 56b3d4cbb..b89a4a8e1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,7 +53,7 @@ jobs: - name: Rename build folder run: mv .hemttout/release .hemttout/@acre2 - name: Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: acre2 path: .hemttout/@* @@ -78,7 +78,7 @@ jobs: echo "Check DirectX SDK: $(Test-Path .\\ci\\directx-sdk\\Include,.\\ci\\directx-sdk\\Lib\\${{ matrix.arch }})" echo "DXSDK_DIR: ${{ env.DXSDK_DIR }}" - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1.3 + uses: microsoft/setup-msbuild@v2 - name: Build Extensions (x86) if: matrix.arch == 'x86' run: | @@ -95,7 +95,7 @@ jobs: run: | .\ci\battleye\signtool.exe sign /f .\ci\battleye\idi-systems.pfx /p ${{ secrets.BE_CRED_PASSWORD }} /t http://timestamp.digicert.com *.dll - name: Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: acre2-extensions-${{ matrix.arch }} path: | @@ -111,7 +111,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 - name: Prepare Archives run: | echo "Organize" @@ -159,7 +159,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 - name: Prepare Archives run: | echo "Organize" @@ -217,7 +217,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 - name: Prepare Archives run: | echo "Organize" diff --git a/addons/sys_core/XEH_preInit.sqf b/addons/sys_core/XEH_preInit.sqf index bcc86d23d..e85653d18 100644 --- a/addons/sys_core/XEH_preInit.sqf +++ b/addons/sys_core/XEH_preInit.sqf @@ -7,7 +7,7 @@ PREP_RECOMPILE_START; PREP_RECOMPILE_END; // CBA Settings -#include "initSettings.sqf" +#include "initSettings.inc.sqf" if (!hasInterface) exitWith { ADDON = true; diff --git a/addons/sys_core/initSettings.sqf b/addons/sys_core/initSettings.inc.sqf similarity index 100% rename from addons/sys_core/initSettings.sqf rename to addons/sys_core/initSettings.inc.sqf diff --git a/addons/sys_gestures/XEH_preInit.sqf b/addons/sys_gestures/XEH_preInit.sqf index 27af4aa79..b5632e46b 100644 --- a/addons/sys_gestures/XEH_preInit.sqf +++ b/addons/sys_gestures/XEH_preInit.sqf @@ -12,6 +12,6 @@ if (hasInterface) then { GVAR(disallowedViews) = ["GUNNER", "GROUP"]; }; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/sys_gestures/initSettings.sqf b/addons/sys_gestures/initSettings.inc.sqf similarity index 100% rename from addons/sys_gestures/initSettings.sqf rename to addons/sys_gestures/initSettings.inc.sqf diff --git a/addons/sys_godmode/XEH_preInit.sqf b/addons/sys_godmode/XEH_preInit.sqf index 3ec4eab38..371e85216 100644 --- a/addons/sys_godmode/XEH_preInit.sqf +++ b/addons/sys_godmode/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" if (hasInterface) then { GVAR(speaking) = false; diff --git a/addons/sys_godmode/initSettings.sqf b/addons/sys_godmode/initSettings.inc.sqf similarity index 100% rename from addons/sys_godmode/initSettings.sqf rename to addons/sys_godmode/initSettings.inc.sqf diff --git a/addons/sys_gui/XEH_preInit.sqf b/addons/sys_gui/XEH_preInit.sqf index 5a6cd5822..9930d0ba8 100644 --- a/addons/sys_gui/XEH_preInit.sqf +++ b/addons/sys_gui/XEH_preInit.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" if (hasInterface) then { ACRE_HOLD_OFF_ITEMRADIO_CHECK = false; diff --git a/addons/sys_gui/initSettings.sqf b/addons/sys_gui/initSettings.inc.sqf similarity index 100% rename from addons/sys_gui/initSettings.sqf rename to addons/sys_gui/initSettings.inc.sqf diff --git a/addons/sys_list/XEH_preInit.sqf b/addons/sys_list/XEH_preInit.sqf index b4215ebcb..2d6e51d30 100644 --- a/addons/sys_list/XEH_preInit.sqf +++ b/addons/sys_list/XEH_preInit.sqf @@ -7,7 +7,7 @@ PREP_RECOMPILE_START; PREP_RECOMPILE_END; // CBA Settings -#include "initSettings.sqf" +#include "initSettings.inc.sqf" if (hasInterface) then { GVAR(hintBuffer) = [[], [], [], [], []]; diff --git a/addons/sys_list/initSettings.sqf b/addons/sys_list/initSettings.inc.sqf similarity index 100% rename from addons/sys_list/initSettings.sqf rename to addons/sys_list/initSettings.inc.sqf diff --git a/addons/sys_radio/XEH_preInit.sqf b/addons/sys_radio/XEH_preInit.sqf index 4527c8de3..b71f34fb9 100644 --- a/addons/sys_radio/XEH_preInit.sqf +++ b/addons/sys_radio/XEH_preInit.sqf @@ -34,6 +34,6 @@ if (hasInterface) then { DVAR(ACRE_SPECTATOR_RADIOS) = []; }; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/sys_radio/initSettings.sqf b/addons/sys_radio/initSettings.inc.sqf similarity index 100% rename from addons/sys_radio/initSettings.sqf rename to addons/sys_radio/initSettings.inc.sqf diff --git a/addons/sys_signal/XEH_preInit.sqf b/addons/sys_signal/XEH_preInit.sqf index ede415eed..b5b6c8f5b 100644 --- a/addons/sys_signal/XEH_preInit.sqf +++ b/addons/sys_signal/XEH_preInit.sqf @@ -13,6 +13,6 @@ if (hasInterface) then { }; // CBA Settings -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/sys_signal/initSettings.sqf b/addons/sys_signal/initSettings.inc.sqf similarity index 100% rename from addons/sys_signal/initSettings.sqf rename to addons/sys_signal/initSettings.inc.sqf diff --git a/addons/sys_zeus/XEH_preInit.sqf b/addons/sys_zeus/XEH_preInit.sqf index 9361d0501..894773534 100644 --- a/addons/sys_zeus/XEH_preInit.sqf +++ b/addons/sys_zeus/XEH_preInit.sqf @@ -6,6 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -#include "initSettings.sqf" +#include "initSettings.inc.sqf" ADDON = true; diff --git a/addons/sys_zeus/initSettings.sqf b/addons/sys_zeus/initSettings.inc.sqf similarity index 100% rename from addons/sys_zeus/initSettings.sqf rename to addons/sys_zeus/initSettings.inc.sqf