Skip to content

Commit 62877f5

Browse files
authored
CI - Use Arma 3 Tools on Linux with HEMTT Wine support (#1411)
1 parent 1f5ffcc commit 62877f5

File tree

2 files changed

+13
-21
lines changed

2 files changed

+13
-21
lines changed

.github/workflows/arma.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ jobs:
3939
steps:
4040
- name: Checkout the source code
4141
uses: actions/checkout@v6
42+
- name: Setup Arma 3 Tools
43+
uses: arma-actions/arma3-tools@master
44+
with:
45+
toolsUrl: ${{ secrets.FTP_SERVER }}/tools/arma3tools.zip
4246
- name: Setup HEMTT
4347
uses: arma-actions/hemtt@v1
4448
- name: Run HEMTT build
@@ -48,6 +52,6 @@ jobs:
4852
- name: Upload Artifact
4953
uses: actions/upload-artifact@v6
5054
with:
51-
name: acre2-${{ github.sha }}-nobin
55+
name: acre2-${{ github.sha }}
5256
path: .hemttout/@*
5357
include-hidden-files: true # Because .hemttout is a hidden directory

.github/workflows/release.yml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,23 @@ on:
1717
jobs:
1818
build:
1919
if: github.repository == 'IDI-Systems/acre2' && ! contains(github.event.head_commit.message, '[ci skip]')
20-
runs-on: windows-latest
20+
runs-on: ubuntu-latest
2121
outputs:
2222
VERSION: ${{ env.VERSION }}
2323
SHA_SHORT: ${{ env.SHA_SHORT }}
2424
steps:
2525
- name: Checkout the source code
2626
uses: actions/checkout@v6
27+
- name: Setup Arma 3 Tools # contains only Binarize
28+
uses: arma-actions/arma3-tools@master
29+
with:
30+
toolsUrl: ${{ secrets.FTP_SERVER }}/tools/arma3tools.zip
2731
- name: Setup HEMTT
2832
uses: arma-actions/hemtt@v1
29-
- name: Setup Binarize
30-
run: |
31-
C:\msys64\usr\bin\wget.exe ${{ secrets.FTP_SERVER }}/tools/acre2_tools.zip --user ${{ secrets.FTP_USERNAME }} --password ${{ secrets.FTP_PASSWORD }} -q
32-
Expand-Archive acre2_tools.zip -DestinationPath ci
33-
echo "Check Binarize: $(Test-Path .\\ci\\binarize\\binarize_x64.exe)"
34-
hemtt --version
35-
echo "Install Binarize dependencies"
36-
cp .\ci\binarize\X3DAudio1_7.dll,.\ci\binarize\XAPOFX1_5.dll C:\Windows\System32\
37-
echo "::group::Set Binarize registry path"
38-
New-Item "HKCU:\\Software\\Bohemia Interactive\\binarize" -Force | New-ItemProperty -Name path -Value "${{ github.workspace }}\ci\binarize"
39-
echo "::endgroup::"
40-
$version = Select-String -Path "addons\\main\\script_version.hpp" -Pattern '#define (MAJOR|MINOR|PATCHLVL|BUILD) (\d+)' | ForEach-Object { $_.Matches.Groups[2].Value } | Join-String -Separator "."
41-
echo "VERSION=$version" >> $env:GITHUB_ENV
42-
echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $env:GITHUB_ENV
43-
- name: Test Binarize
33+
- name: Prepare Metadata
4434
run: |
45-
echo "::group::Run Binarize without arguments (look for missing DLLs)"
46-
./ci/binarize/binarize_x64.exe || true # binarize exits with 1 if no file given
47-
echo "::endgroup::"
48-
shell: bash # outputs missing dll information
35+
echo "VERSION=$(hemtt value project.version.short)" >> $GITHUB_ENV
36+
echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
4937
- name: Build (HEMTT)
5038
run: |
5139
echo "ACRE2 v${{ env.VERSION }} (${{ env.SHA_SHORT }})"

0 commit comments

Comments
 (0)