Skip to content
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.

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

Extensions - Rust #9015

Merged
merged 70 commits into from
Aug 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
cb181d8
ballistics, clipboard
BrettMayson Aug 27, 2022
1b21ff1
change extension name, fix command call
BrettMayson Aug 27, 2022
944f1ff
build and tested
BrettMayson Aug 27, 2022
4cf4391
one day I will remember to add files before commit
BrettMayson Aug 27, 2022
ae2ff2a
wip
BrettMayson Aug 27, 2022
8c10e12
wip
BrettMayson Aug 30, 2022
cb7fb0a
artillery tables, fcs
BrettMayson Aug 30, 2022
850cf1b
fcs
BrettMayson Aug 30, 2022
0be3415
working tables
BrettMayson Aug 30, 2022
834786f
cleanup, docs, make
BrettMayson Aug 30, 2022
b9ad607
fix extension yml
BrettMayson Aug 30, 2022
8ca10b9
fix extension yml
BrettMayson Aug 30, 2022
d5ef801
fix extension yml
BrettMayson Aug 30, 2022
d9f6c86
fix extension yml
BrettMayson Aug 30, 2022
e073c66
install linux test dependencies
BrettMayson Aug 30, 2022
90bf98e
fix extension yml
BrettMayson Aug 30, 2022
cfa1105
fix extension yml
BrettMayson Aug 30, 2022
7401a45
fix extension yml
BrettMayson Aug 30, 2022
4d9730c
don't test clipboard on linux
BrettMayson Aug 31, 2022
2cabd20
don't test clipboard on linux
BrettMayson Aug 31, 2022
8fe4b9a
add test for fcs
BrettMayson Aug 31, 2022
3b8fe5b
use published arma-rs
BrettMayson Aug 31, 2022
d3411df
first char is already checked for existance
BrettMayson Aug 31, 2022
7ae959f
fix extension path
BrettMayson Aug 31, 2022
78b25e4
flip typo on artillery precision
BrettMayson Aug 31, 2022
6eeee96
isEqualTo > ==
BrettMayson Aug 31, 2022
12f95bf
;
BrettMayson Aug 31, 2022
19393a8
remove ';' from export
BrettMayson Oct 8, 2022
d02ebbd
Initial Commit
LorenLuke Jul 28, 2023
880242c
Merge branch 'master' of github.com:acemod/ACE3 into ArtilleryExtension
LorenLuke Jul 29, 2023
1168694
Second Commit.
LorenLuke Jul 31, 2023
df8ea11
Incorporate suggestions, clarify variables
LorenLuke Aug 11, 2023
07e817d
Apply suggestions from Eathox's code review
BrettMayson Sep 13, 2023
ada9b0c
Merge branch 'master' into rust
BrettMayson Sep 18, 2023
a3f72ca
fix error macro usage
BrettMayson Sep 18, 2023
4a06e7b
Merge branch 'master' into rust
BrettMayson Oct 19, 2023
c03d86d
Merge branch 'master' into rust
BrettMayson Oct 23, 2023
f149ee4
update deps, add checkFiles
BrettMayson Oct 24, 2023
13feb23
Apply suggestions from code review
BrettMayson Oct 24, 2023
dcb2997
rebuild, add cache to ci
BrettMayson Oct 24, 2023
63737b8
Merge branch 'master' into rust
BrettMayson Nov 20, 2023
024d28c
Update extension/src/lib.rs
BrettMayson Dec 12, 2023
37d7399
Merge remote-tracking branch 'upstream/master' into rust
BrettMayson Jan 18, 2024
667510f
extension fmt and update deps
BrettMayson Jan 18, 2024
a022867
get version from git
BrettMayson Jan 18, 2024
4e40a1b
merge #9298
BrettMayson Jan 18, 2024
9db162e
add build.rs
BrettMayson Jan 18, 2024
3a22190
fix includes to script_component
BrettMayson Jan 18, 2024
2ebd632
update dlls, fix get_solution
BrettMayson Jan 18, 2024
f0145b5
a bit of rust cleanup
BrettMayson Jan 18, 2024
532b193
test the extension on more file changes
BrettMayson Jan 18, 2024
6ff692d
fix atmosphericmodel from arma
BrettMayson Jan 19, 2024
8716f52
xm157 conversion
PabstMirror Jan 19, 2024
ec34f36
parseSimpleArray
BrettMayson Jan 21, 2024
417a0f1
Merge branch 'rust' of github.com:brettmayson/ace3 into rust
BrettMayson Jan 21, 2024
ffe9b31
fix example calls, fix find_max_angle
BrettMayson Jan 21, 2024
5bfd5a6
fix argument order
BrettMayson Jan 23, 2024
f29cbe3
Merge remote-tracking branch 'upstream/master' into rust
BrettMayson Apr 20, 2024
a95e2cf
fix merge
BrettMayson Apr 20, 2024
ca7ccf3
semicolon
LinkIsGrim Jun 20, 2024
df8fd3b
fix max/min
LinkIsGrim Jun 20, 2024
bbde68f
variable name
LinkIsGrim Jun 20, 2024
38c8eb0
Merge remote-tracking branch 'origin/master' into pr/BrettMayson/9015
LinkIsGrim Jun 20, 2024
fa8a3fa
Merge branch 'master' into pr/9015
johnb432 Jun 22, 2024
0464be6
Update fnc_checkFiles.sqf
johnb432 Jun 24, 2024
1d37820
update EPSILON for newer rust versions
BrettMayson Jul 1, 2024
c46023a
Extension: get loadout from clipboard (#5)
BrettMayson Jul 1, 2024
db8d552
ab::bullet - cleanup unused vars
PabstMirror Aug 16, 2024
08c9ae0
Minor cleanup
johnb432 Aug 16, 2024
90706ca
Use endl
johnb432 Aug 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,8 @@ trim_trailing_whitespace = true
[*.md]
trim_trailing_whitespace = false

[*.yml]
indent_size = 2

[Makefile]
indent_style = tab
66 changes: 51 additions & 15 deletions .github/workflows/extensions.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,65 @@
name: Extensions

on:
pull_request:
push:
paths:
- 'extensions/**'
- 'extension/**'
- 'Cargo.toml'
- 'Cargo.lock'
- '.github/workflows/extensions.yml'

jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout the source code
uses: actions/checkout@master
- name: Install dependencies
run: |
rustup toolchain update stable --no-self-update
rustup default stable
rustup component add clippy rustfmt
- name: Run rustfmt
run: cargo fmt -- --check
- name: Run clippy
run: cargo clippy --all -- -Dwarnings

test:
runs-on: ubuntu-latest
container:
image: xd009642/tarpaulin
options: --security-opt seccomp=unconfined
steps:
- name: Checkout the source code
uses: actions/checkout@master
- name: Test & Coverage
run: cargo tarpaulin --verbose --no-default-features --workspace --timeout 240

build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest]

arrays: [
os: { tag: "windows-latest", target: "i686-pc-windows-msvc" },
os: { tag: "windows-latest", target: "x86_64-pc-windows-msvc" },
]
runs-on: ${{ matrix.arrays.os.tag }}
steps:
- name: Checkout the source code
uses: actions/checkout@v4
- name: Install stable Rust
uses: actions-rs/toolchain@v1
with:
target: ${{ matrix.arrays.os.target }}
toolchain: stable
default: true
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build
shell: cmd
run: |
cd extensions
mkdir build
cd build
cmake .. && cmake --build .
- name: Upload Artifact
uses: actions/upload-artifact@v4
run: cargo build --verbose
- name: Upload
uses: actions/upload-artifact@v2
with:
name: ace3_extensions-${{ matrix.os }}-debug
path: extensions/build
name: ${{ matrix.arrays.os.target }}
path: target/debug/ace.dll
if-no-files-found: error
retention-days: 30
2 changes: 2 additions & 0 deletions .github/workflows/hemtt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ jobs:
xcopy /e /h /q pullrequest\addons addons\
xcopy /e /h /q pullrequest\optionals optionals\
xcopy /e /h /q pullrequest\include include\
xcopy /e /h /q pullrequest\ace.dll ace.dll
xcopy /e /h /q pullrequest\ace_x64.dll ace_x64.dll
- name: Run HEMTT build
run: hemtt build
- name: Rename build folder
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
*.zip
release/*
releases/*
extensions/vcproj32/*
extensions/vcproj64/*
.vscode/*
hemtt
hemtt.exe
Expand All @@ -20,4 +18,5 @@ CHANGELOG.md
sqfvm.exe
ArmaScriptCompiler.exe
*.sqfc
target/
!extras/**/*.zip
Loading