Skip to content

Commit beea6ed

Browse files
committed
Tools - Update workflow actions / includes folder
1 parent ef29cc5 commit beea6ed

File tree

6 files changed

+24
-14
lines changed

6 files changed

+24
-14
lines changed

.github/workflows/arma.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout the source code
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v6
1515
- name: Validate Config
1616
run: python3 tools/config_style_checker.py
1717
- name: Validate Stringtables
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- name: Checkout the source code
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v6
3333
- name: Setup HEMTT
3434
uses: arma-actions/hemtt@v1
3535
with:
@@ -39,7 +39,7 @@ jobs:
3939
- name: Rename build folder
4040
run: mv .hemttout/build .hemttout/@ace
4141
- name: Upload Artifact
42-
uses: actions/upload-artifact@v4
42+
uses: actions/upload-artifact@v6
4343
with:
4444
name: ace3-${{ github.sha }}-nobin
4545
path: .hemttout/@*

.github/workflows/documentation.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout the source code
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919
- name: Install Python packages
2020
run: |
2121
pip3 install wheel
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
- name: Checkout
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@v6
3737

3838
- name: Extract Dependencies
3939
run: python3 tools/extract_dependencies.py --markdown
@@ -47,7 +47,7 @@ jobs:
4747
destination: docs/_site/
4848

4949
- name: Upload Artifact
50-
uses: actions/upload-artifact@v4
50+
uses: actions/upload-artifact@v6
5151
with:
5252
name: jekyll-site
5353
path: docs/_site/
@@ -63,7 +63,7 @@ jobs:
6363

6464
steps:
6565
- name: Download Artifacts
66-
uses: actions/download-artifact@v4
66+
uses: actions/download-artifact@v6
6767
with:
6868
name: jekyll-site
6969
path: _site/

.github/workflows/extensions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
runs-on: ${{ matrix.arrays.os.tag }}
4646
steps:
4747
- name: Checkout the source code
48-
uses: actions/checkout@v4
48+
uses: actions/checkout@v6
4949
- name: Install stable Rust
5050
uses: actions-rs/toolchain@v1
5151
with:
@@ -57,7 +57,7 @@ jobs:
5757
- name: Build
5858
run: cargo build --verbose
5959
- name: Upload
60-
uses: actions/upload-artifact@v4
60+
uses: actions/upload-artifact@v6
6161
with:
6262
name: ${{ matrix.arrays.os.target }}
6363
path: target/debug/ace.dll

.github/workflows/hemtt.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
with:
1616
toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }}
1717
- name: Checkout the source code
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919
- name: Setup HEMTT
2020
uses: arma-actions/hemtt@v1
2121
- name: Checkout pull request
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2323
if: ${{ github.event_name == 'pull_request_target' }}
2424
with:
2525
path: pullrequest
@@ -40,7 +40,7 @@ jobs:
4040
- name: Rename build folder
4141
run: mv .hemttout/build .hemttout/@ace
4242
- name: Upload Artifact
43-
uses: actions/upload-artifact@v4
43+
uses: actions/upload-artifact@v6
4444
with:
4545
name: ace3-${{ github.sha }}
4646
path: .hemttout/@*

include/a3/ui_f/hpp/defineDIKCodes.inc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,16 @@
9797
#define DIK_F14 0x65 /* (NEC PC98) */
9898
#define DIK_F15 0x66 /* (NEC PC98) */
9999

100+
#define DIK_F16 0x67
101+
#define DIK_F17 0x68
102+
#define DIK_F18 0x69
103+
#define DIK_F19 0x6A
104+
#define DIK_F20 0x6B
105+
#define DIK_F21 0x6C
106+
#define DIK_F22 0x6D
107+
#define DIK_F23 0x6E
108+
#define DIK_F24 0x76
109+
100110
#define DIK_KANA 0x70 /* (Japanese keyboard) */
101111
#define DIK_ABNT_C1 0x73 /* / ? on Portugese (Brazilian) keyboards */
102112
#define DIK_CONVERT 0x79 /* (Japanese keyboard) */

include/x/cba/addons/main/script_macros_common.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -964,8 +964,8 @@ Macro: PREP()
964964
//#define PREP(var1) PREP_SYS(PREFIX,COMPONENT_F,var1)
965965

966966
#ifdef DISABLE_COMPILE_CACHE
967-
#define PREP(var1) TRIPLES(ADDON,fnc,var1) = compile preProcessFileLineNumbers 'PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))'
968-
#define PREPMAIN(var1) TRIPLES(PREFIX,fnc,var1) = compile preProcessFileLineNumbers 'PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))'
967+
#define PREP(var1) TRIPLES(ADDON,fnc,var1) = compile preprocessFileLineNumbers 'PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))'
968+
#define PREPMAIN(var1) TRIPLES(PREFIX,fnc,var1) = compile preprocessFileLineNumbers 'PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))'
969969
#else
970970
#define PREP(var1) ['PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))', 'TRIPLES(ADDON,fnc,var1)'] call SLX_XEH_COMPILE_NEW
971971
#define PREPMAIN(var1) ['PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))', 'TRIPLES(PREFIX,fnc,var1)'] call SLX_XEH_COMPILE_NEW

0 commit comments

Comments
 (0)