Merge branch 'master' into develop

This commit is contained in:
2023-10-10 18:04:00 -07:00
2 changed files with 7 additions and 4 deletions

View File

@@ -10,11 +10,11 @@ on:
branches: ["develop"] branches: ["develop"]
jobs: jobs:
build: BuildWin64:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: BuildWin64 - name: build
uses: addnab/docker-run-action@v3 uses: addnab/docker-run-action@v3
with: with:
image: x1unix/go-mingw:1.20 image: x1unix/go-mingw:1.20
@@ -23,7 +23,10 @@ jobs:
run: | run: |
go build -o ./ifxmetrics_x64.dll -buildmode=c-shared -buildvcs=false -ldflags "-w -s -X main.EXTENSION_VERSION=${{github.ref_name}}-${{github.sha}}" ./extension/cmd go build -o ./ifxmetrics_x64.dll -buildmode=c-shared -buildvcs=false -ldflags "-w -s -X main.EXTENSION_VERSION=${{github.ref_name}}-${{github.sha}}" ./extension/cmd
- name: BuildWin32 BuildWin32:
runs-on: ubuntu-latest
steps:
- name: build
uses: addnab/docker-run-action@v3 uses: addnab/docker-run-action@v3
with: with:
image: x1unix/go-mingw:1.20 image: x1unix/go-mingw:1.20

View File

@@ -29,7 +29,7 @@ In the below example, the `milsimServerEfficiency` event handler will send data
// ... // ...
"cbaEventHandlers": { "cbaEventHandlers": {
"milsimServerEfficiency": { "milsimServerEfficiency": {
"name": "milsimServerEfficiency", "eventName": "milsimServerEfficiency",
"description": "EVENTHANDLER. Tracks the efficiency of the server.", "description": "EVENTHANDLER. Tracks the efficiency of the server.",
"enabled": true, "enabled": true,
"bucket": "server_performance", "bucket": "server_performance",