Skip to content

Commit

Permalink
Merge branch 'main' into Updated-magazines-for-Charlie-HMMWVs
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreasBrostrom authored Aug 19, 2024
2 parents 8dce2cf + 0c3b9c5 commit 763c7e2
Show file tree
Hide file tree
Showing 49 changed files with 694 additions and 1,953 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,18 @@ trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false

[*.yml]
indent_size = 2

[*.hpp]
indent_style = space
indent_size = 4

[*.cpp]
indent_style = space
indent_size = 4

[*.sqf]
indent_style = space
indent_size = 4
1 change: 1 addition & 0 deletions .github/workflows/create_artifacts.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: Create Artifacts
on: workflow_dispatch

jobs:
build:
name: Create And Upload Releases
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: Deploy Release
on:
release:
types: [ published ]
types: [published]

jobs:
build:
name: Create And Upload Release
Expand Down Expand Up @@ -37,7 +38,6 @@ jobs:
asset_name: cScripts_Debug-${{github.ref_name}}.zip
file: release/cScripts_Debug-${{github.ref_name}}.zip


- name: Upload release (cScripts_NoRadio)
uses: svenstaro/upload-release-action@v2
with:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/deploy_artifacts_main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: Deploy DevBuild Artifacts
on:
push:
branches:
- main
branches:
- main

jobs:
build:
name: Create And Upload Releases
Expand All @@ -18,4 +19,4 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: cScripts_DevBuilds
path: release/*
path: release/*
7 changes: 4 additions & 3 deletions .github/workflows/deploy_artifacts_tag.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: Deploy Tag Artifacts
on:
push:
tags:
- '*'
tags:
- "*"

jobs:
build:
name: Create And Upload Releases
Expand All @@ -18,4 +19,4 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: cScripts_Releases
path: release/*
path: release/*
78 changes: 45 additions & 33 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,57 @@
name: Testing
on: [push, pull_request]
on:
pull_request:
push:

jobs:
validate:
runs-on: ubuntu-latest
if: github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name
steps:
- name: Checkout the source code
uses: actions/checkout@master
- name: Validate SQF
run: python3 tools/sqf_validator.py
- name: Validate Config
run: python3 tools/config_style_checker.py
- name: Checkout the source code
uses: actions/checkout@master
- name: Validate SQF
run: python3 tools/sqf_validator.py
- name: Validate Config
run: python3 tools/config_style_checker.py

lint:
runs-on: ubuntu-latest
if: github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name
steps:
- name: Checkout the source code
uses: actions/checkout@master
- name: Lint (sqflint)
uses: arma-actions/sqflint@master
with:
args: --exit e --directory cScripts/functions
continue-on-error: true # No failure due to many false-positives
- name: Checkout the source code
uses: actions/checkout@master
- name: Lint (sqflint)
uses: arma-actions/sqflint@master
with:
args: --exit e --directory cScripts/functions
continue-on-error: true # No failure due to many false-positives

testing:
runs-on: ubuntu-latest
if: github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name
steps:
- name: Checkout the source code
uses: actions/checkout@master
- name: Check DEBUG_MODE
if: always()
run: bash tools/checkDebug.sh
- name: Check TODO
if: always()
run: bash tools/checkTodo.sh
continue-on-error: true
- name: Check for FIXME
if: always()
run: bash tools/checkFixme.sh
- name: Check for LOGGING
if: always()
run: bash tools/checkLogging.sh
- name: Check Pull Request Name
if: always()
run: bash tools/checkPullRequestTitle.sh ${{ github.event.pull_request.title }}
- name: Checkout the source code
uses: actions/checkout@master
- name: Check DEBUG_MODE
if: always()
run: bash tools/checkDebug.sh
- name: Check TODO
if: always()
run: bash tools/checkTodo.sh
continue-on-error: true
- name: Check for FIXME
if: always()
run: bash tools/checkFixme.sh
- name: Check for LOGGING
if: always()
run: bash tools/checkLogging.sh
- name: Check Pull Request Name
if: always()
run: bash tools/checkPullRequestTitle.sh ${{ github.event.pull_request.title }}
Loading

0 comments on commit 763c7e2

Please sign in to comment.