Skip to content

Commit

Permalink
Merge branch 'main' into notnot
Browse files Browse the repository at this point in the history
  • Loading branch information
PabstMirror committed Oct 20, 2024
2 parents e475613 + 73292eb commit 3fecf02
Show file tree
Hide file tree
Showing 190 changed files with 23,166 additions and 3,079 deletions.
2 changes: 2 additions & 0 deletions .github/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ coverage:
# Test files aren't important for coverage
ignore:
- "tests"
- "hls"
- "book-lints"

# Make comments less noisy
comment:
Expand Down
35 changes: 14 additions & 21 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,6 @@ jobs:
- runner: windows-latest
name: windows
artifact: windows-x64
- runner: macos-13
name: macos-x64
artifact: macos-x64
- runner: macos-latest
name: macos-arm
artifact: macos-arm64
mod:
- repo: CBATeam/CBA_A3
commit: b99dddf46aca7cea008bca56f5a553c5d7776219
Expand Down Expand Up @@ -116,8 +110,7 @@ jobs:
run: |
cd mod && hemtt dev
- name: Install Arma 3 Tools
if: startsWith(matrix.os.runner, 'windows')
uses: arma-actions/arma3-tools@master
uses: arma-actions/arma3-tools@linux
with:
toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }}
- name: Run `hemtt build` on ${{ matrix.mod.repo }}
Expand All @@ -140,39 +133,39 @@ jobs:
name: linux-x64
path: release

- name: Rename Linux x64
run: |
cd release && mv hemtt linux-x64
- name: Download Windows x64
uses: actions/download-artifact@v4
with:
name: windows-x64
path: release

- name: Zip Windows x64
run: |
cd release && zip windows-x64.zip hemtt.exe && rm hemtt.exe
- name: Download MacOS x64
uses: actions/download-artifact@v4
with:
name: macos-x64
path: release

- name: Rename MacOS x64
run: |
cd release && mv hemtt darwin-x64
- name: Download MacOS ARM64
uses: actions/download-artifact@v4
with:
name: macos-arm64
path: release

- name: Rename Linux x64
run: |
cd release && mv hemtt linux-x64
- name: Rename Windows x64
run: |
cd release && mv hemtt.exe windows-x64
- name: Rename MacOS x64
run: |
cd macos-x64 && mv hemtt darwin-x64
- name: Rename MacOS ARM64
run: |
cd macos-arm64 && mv hemtt darwin-arm64
cd release && mv hemtt darwin-arm64
- name: Release
uses: softprops/action-gh-release@v2
Expand Down
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ target/
generated.hpp
map.hpp
*.map
*.pbo
# *.pbo

*.nupkg

Expand All @@ -27,3 +27,9 @@ pkg/
hls/languages/sqf.json
hls/hemtt-language-server
hls/hemtt-language-server.exe

# Insta Pending Snpashots
*.snap.new

# Cargo Mutants
mutants.*/
31 changes: 31 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Contributing

## Testing

When running tests locally, it is highly recommended to use `cargo-nextest`.

It runs the tests much faster, and can detect slow and leaky tests, among other features.

```bash
cargo install cargo-nextest
cargo nextest run
```

## Lint Tests

Tests for lints are using [insta](https://docs.rs/insta) for snapshot testing.

When you make changes to the lints, that causes tests to fail, you will need to review the changes.

```bash
cargo install cargo-insta
# Run the tests before reviewing, you can just run an individual test, or use any testing tool
cargo nextest run
# Review the changes
cargo insta review

# Alternatively, you can run the tests with insta to review the changes in one command
cargo insta test --review
```

When reviewing changes with ANSI characters, you can press `d` to toggle between the diff and a rendered view.
Loading

0 comments on commit 3fecf02

Please sign in to comment.