Skip to content

Commit

Permalink
Merge branch 'master' into Trench-improvements-from-Grad-Trenches
Browse files Browse the repository at this point in the history
  • Loading branch information
jonpas committed Jul 1, 2020
2 parents c315493 + b16ca5c commit 6313cb6
Show file tree
Hide file tree
Showing 1,987 changed files with 60,191 additions and 33,142 deletions.
25 changes: 0 additions & 25 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: kind/bug
assignees: ''

---

**Mods (complete and add to the following information):**
- **Arma 3:** `x.xx` [e.g. 1.00 stable, rc, dev]
- **CBA:** `3.x.x` [e.g. 3.0.0 stable, commit hash]
- **ACE3:** `3.x.x` [eg. 3.0.0 stable, commit hash]
_Make sure to reproduce the issue with only CBA and ACE3 on a newly created mission!_

**Description:**
A clear and concise description of what the bug is.

**Steps to reproduce:**
- _Follow [https://ace3mod.com/img/wiki/user/issue_flowchart.png](this flowchart)!_
- Go to ...
- Click ...
- See ...

**Expected behavior:**
A clear and concise description of what you expected to happen.

**Where did the issue occur?**
- Dedicated / Self-Hosted Multiplayer / Singleplayer / Editor (Singleplayer) / Editor (Multiplayer) / Virtual Arsenal

**Log Files:**
- Link to ([gist](https://gist.github.com) or [pastebin](http://pastebin.com)) to the client and/or server RPT file. An instruction to find your RPT files can be found [here](https://community.bistudio.com/wiki/Crash_Files#Arma_3).

**Additional context:**
Add any other context about the problem here.

**Screenshots:**
If applicable, add screenshots to help explain your problem.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/enhancement-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Enhancement request
about: Suggest an improvement for this project
title: ''
labels: kind/enhancement
assignees: ''

---

**Is your enhancement related to a problem?**
A clear and concise description of what the enhancement entails. Ex. [...] would improve user experience.

**Solution you'd like:**
A clear and concise description of what you want to happen.

**Alternatives you've considered:**
A clear and concise description of any alternative solutions or ideas you've considered.

**Additional context:**
Add any other context or screenshots about the enhancement here.
12 changes: 12 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: kind/feature request, status/invalid
assignees: ''

---

### Do not post feature requests here!

Learn how to make a feature request [here](https://ace3mod.com/wiki/user/how-to-make-a-feature-request.html).
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
- Each change in a separate line
- Include documentation if applicable
- Respect the [Development Guidelines](https://ace3mod.com/wiki/development/)
- Follow title standard `Component - Add|Fix|Improve|Change|Make|Remove bananas`
42 changes: 42 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
branches:
- master
- release-drafter # for testing edits to this configuration

name-template: 'Version $NEXT_PATCH_VERSION'
tag-template: 'v$NEXT_PATCH_VERSION'

categories:
- title: '**ADDED:**'
labels:
- 'kind/feature request'
- 'kind/added feature'
- title: '**FIXED:**'
labels:
- 'kind/bug fix'
- title: '**IMPROVED:**'
labels:
- 'kind/enhancement'
- 'kind/optimization'
- title: '**CHANGED:**'
labels:
- 'kind/cleanup'
- 'area/compatibility'
- title: '**TRANSLATIONS:**'
labels:
- 'area/translations'

exclude-labels:
- 'ignore changelog'

change-template: '- $TITLE (#$NUMBER)'
template: |
_Requires CBA version X.Y.Z or later and Arma 3 version X.Y or later._
## Change Log Summary
$CHANGES
replacers:
# Category titles
- search: '/\#\# (\*\*(ADDED|FIXED|IMPROVED|CHANGED|TRANSLATIONS):\*\*)/g'
replace: '$1'
1 change: 1 addition & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ exemptLabels:
- status/cherrypick
- status/merge on release
- sticky
- help wanted

# Label to use when marking an issue as stale
staleLabel: status/stale
Expand Down
48 changes: 48 additions & 0 deletions .github/workflows/arma.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Arma

on:
push:
branches:
- master
pull_request:

jobs:
validate:
runs-on: ubuntu-latest
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: Validate Stringtables
run: python3 tools/stringtable_validator.py
- name: Check Strings
run: python3 tools/check_strings.py
- name: Check for BOM
uses: arma-actions/bom-check@master

lint:
runs-on: ubuntu-latest
steps:
- name: Checkout the source code
uses: actions/checkout@master
- name: Lint (sqflint)
uses: arma-actions/sqflint@master
continue-on-error: true # No failure due to many false-positives

build:
runs-on: ubuntu-latest
steps:
- name: Checkout the source code
uses: actions/checkout@master
- name: Build using HEMTT
uses: arma-actions/hemtt@master
with:
command: build --release --ci
- name: Upload Artifact
uses: actions/upload-artifact@v2-preview
with:
name: ace3-${{ github.sha }}-nobin
path: releases/ace3_*.zip
24 changes: 24 additions & 0 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Documentation

on:
push:
branches:
- master

jobs:
update:
runs-on: ubuntu-latest
steps:
- name: Checkout the source code
uses: actions/checkout@master
- name: Install Python packages
run: |
pip3 install wheel
pip3 install setuptools
pip3 install pygithub
pip3 install pygithub3
- name: Deploy
if: github.repository == 'acemod/ACE3' && ! contains(github.event.head_commit.message, '[ci skip]')
env:
GH_TOKEN: ${{ secrets.DOCS_TOKEN }}
run: python3 tools/deploy.py
31 changes: 31 additions & 0 deletions .github/workflows/extensions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Extensions

on:
pull_request:
paths:
- 'extensions/*'
- 'extensions/*/*'
- 'extensions/*/*/*'
- 'extensions/*/*/*/*'
- 'extensions/*/*/*/*/*'

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

steps:
- name: Checkout the source code
uses: actions/checkout@master
- name: Build
shell: cmd
run: |
cd extensions/build
cmake .. && cmake --build .
- name: Upload Artifact
uses: actions/upload-artifact@master
with:
name: ace3_extensions-${{ matrix.os }}-debug
path: extensions/build
16 changes: 16 additions & 0 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Release Drafter

on:
push:
branches:
- master

jobs:
draft:
runs-on: ubuntu-latest
steps:
- name: Release Drafter
if: github.repository == 'acemod/ACE3'
uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
20 changes: 0 additions & 20 deletions .github_changelog_generator

This file was deleted.

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
@*
*.zip
release/*
releases/*
hemtt
hemtt.exe
tools/temp
tools/armake.exe
*.cache
*.pbo
texHeaders.bin
Expand Down
Loading

0 comments on commit 6313cb6

Please sign in to comment.