Skip to content

Tools - Update workflow actions / includes folder #11179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PabstMirror merged 1 commit into from
Jan 20, 2026
+24 −14
Merged

Tools - Update workflow actions / includes folder #11179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/arma.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the source code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Validate Config
run: python3 tools/config_style_checker.py
- name: Validate Stringtables
Expand All @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the source code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup HEMTT
uses: arma-actions/hemtt@v1
with:
Expand All @@ -39,7 +39,7 @@ jobs:
- name: Rename build folder
run: mv .hemttout/build .hemttout/@ace
- name: Upload Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: ace3-${{ github.sha }}-nobin
path: .hemttout/@*
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/documentation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the source code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Install Python packages
run: |
pip3 install wheel
Expand All @@ -33,7 +33,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Extract Dependencies
run: python3 tools/extract_dependencies.py --markdown
Expand All @@ -47,7 +47,7 @@ jobs:
destination: docs/_site/

- name: Upload Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: jekyll-site
path: docs/_site/
Expand All @@ -63,7 +63,7 @@ jobs:

steps:
- name: Download Artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v6
with:
name: jekyll-site
path: _site/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/extensions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
runs-on: ${{ matrix.arrays.os.tag }}
steps:
- name: Checkout the source code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Install stable Rust
uses: actions-rs/toolchain@v1
with:
Expand All @@ -57,7 +57,7 @@ jobs:
- name: Build
run: cargo build --verbose
- name: Upload
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: ${{ matrix.arrays.os.target }}
path: target/debug/ace.dll
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/hemtt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
with:
toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }}
- name: Checkout the source code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup HEMTT
uses: arma-actions/hemtt@v1
- name: Checkout pull request
uses: actions/checkout@v4
uses: actions/checkout@v6
if: ${{ github.event_name == 'pull_request_target' }}
with:
path: pullrequest
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Rename build folder
run: mv .hemttout/build .hemttout/@ace
- name: Upload Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: ace3-${{ github.sha }}
path: .hemttout/@*
Expand Down
10 changes: 10 additions & 0 deletions include/a3/ui_f/hpp/defineDIKCodes.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,16 @@
#define DIK_F14 0x65 /* (NEC PC98) */
#define DIK_F15 0x66 /* (NEC PC98) */

#define DIK_F16 0x67
#define DIK_F17 0x68
#define DIK_F18 0x69
#define DIK_F19 0x6A
#define DIK_F20 0x6B
#define DIK_F21 0x6C
#define DIK_F22 0x6D
#define DIK_F23 0x6E
#define DIK_F24 0x76

#define DIK_KANA 0x70 /* (Japanese keyboard) */
#define DIK_ABNT_C1 0x73 /* / ? on Portugese (Brazilian) keyboards */
#define DIK_CONVERT 0x79 /* (Japanese keyboard) */
Expand Down
4 changes: 2 additions & 2 deletions include/x/cba/addons/main/script_macros_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,8 +964,8 @@ Macro: PREP()
//#define PREP(var1) PREP_SYS(PREFIX,COMPONENT_F,var1)

#ifdef DISABLE_COMPILE_CACHE
#define PREP(var1) TRIPLES(ADDON,fnc,var1) = compile preProcessFileLineNumbers 'PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))'
#define PREPMAIN(var1) TRIPLES(PREFIX,fnc,var1) = compile preProcessFileLineNumbers 'PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))'
#define PREP(var1) TRIPLES(ADDON,fnc,var1) = compile preprocessFileLineNumbers 'PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))'
#define PREPMAIN(var1) TRIPLES(PREFIX,fnc,var1) = compile preprocessFileLineNumbers 'PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))'
#else
#define PREP(var1) ['PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))', 'TRIPLES(ADDON,fnc,var1)'] call SLX_XEH_COMPILE_NEW
#define PREPMAIN(var1) ['PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))', 'TRIPLES(PREFIX,fnc,var1)'] call SLX_XEH_COMPILE_NEW
Expand Down
Loading