Skip to content

Commit

Permalink
Merge pull request #666 from Sparker95/build-tools
Browse files Browse the repository at this point in the history
I am very proud to merge this pull request 666.
Don't worry about the pull requests which will be broken, we will handle this.
  • Loading branch information
Sparker95 authored Jul 5, 2020
2 parents 96d30bc + 926ede0 commit 50ed6b6
Show file tree
Hide file tree
Showing 1,747 changed files with 147,564 additions and 163,975 deletions.
81 changes: 0 additions & 81 deletions .github/workflows/build-dev.yml

This file was deleted.

99 changes: 99 additions & 0 deletions .github/workflows/devValidateTestBuildUpload.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
name: Dev Validate Test Build Upload

on:
push:
branches:
- development

jobs:

validate:
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- name: Checkout the source code
uses: actions/checkout@master

- name: Validate Config
run: python3 tools/SQF-validate/config_style_checker.py

- name: Check for BOM
uses: arma-actions/bom-check@master
with:
path: 'src'

test:
runs-on: windows-latest
timeout-minutes: 5
steps:
- name: Checkout the code
uses: actions/checkout@master

- name: Validate SQF with SQF-VM
run: |
cd src
New-Item .\config\user_local_config.hpp -ItemType File
..\tools\SQF-VM\sqfvm.exe -a --no-execute-print --disable-macro-warnings --load . -i D:\a\Vindicta\Vindicta\src\Tests\RunTests.sqf
build:
runs-on: windows-latest
timeout-minutes: 5
needs: [validate, test]
steps:
- name: Checkout the code
uses: actions/checkout@master

- name: Build Missions
run: '.\tools\Builder\buildMissions.ps1 -verPatch ${{ github.run_number }}'

- name: Build addons
run: '.\tools\Builder\buildAddons.ps1'

- name: Upload build addon artifact
uses: actions/upload-artifact@v2
with:
name: armaAddon
path: _build\addon\Vindicta

- name: Upload separate missions artifact
uses: actions/upload-artifact@v2
with:
name: separateMissions
path: _build\missions\separatePBO

upload:
runs-on: ubuntu-latest
timeout-minutes: 10
needs: [build]
steps:
- name: Download addon artifact
uses: actions/download-artifact@v2
with:
name: armaAddon
path: armaAddon

- name: Download separate missions artifact
uses: actions/download-artifact@v2
with:
name: separateMissions
path: separateMissions

- name: Upload to FTP
uses: sebastianpopp/[email protected]
with:
host: ${{ secrets.FTP_SERVER }}
user: ${{ secrets.FTP_USERNAME }}
password: ${{ secrets.FTP_PASSWORD }}
localDir: "separateMissions"
remoteDir: "/ugs-eu-germany-1.armahosts.com_2322/mpmissions"

- name: Publish to Steam Workshop
uses: arma-actions/workshop-upload@v1
with:
appId: '107410' # default
itemId: '2154322285' # https://steamcommunity.com/sharedfiles/filedetails/?id=2154322285
contentPath: 'armaAddon'
changelog: ""
env:
STEAM_USERNAME: ${{ secrets.STEAM_VIN_USER }}
STEAM_PASSWORD: ${{ secrets.STEAM_VIN_PW }}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Validate Test and Build
name: Validate Test Build
on:
push:
branches-ignore: [master, development]
Expand All @@ -17,7 +17,7 @@ jobs:
- name: Check for BOM
uses: arma-actions/bom-check@master
with:
path: 'Vindicta.Altis'
path: 'src'

test:
runs-on: windows-latest
Expand All @@ -27,32 +27,29 @@ jobs:
uses: actions/checkout@master
- name: Validate SQF with SQF-VM
run: |
cd Vindicta.Altis
cd src
New-Item .\config\user_local_config.hpp -ItemType File
..\tools\SQF-VM\sqfvm.exe -a --no-execute-print --disable-macro-warnings --load . -i D:\a\Vindicta\Vindicta\Vindicta.Altis\Tests\RunTests.sqf
..\tools\SQF-VM\sqfvm.exe -a --no-execute-print --disable-macro-warnings --load . -i D:\a\Vindicta\Vindicta\src\Tests\RunTests.sqf
build:
runs-on: windows-latest
timeout-minutes: 5
needs: [validate, test]
steps:

- uses: actions/checkout@master
- uses: actions/setup-node@v1
with:
node-version: '10.x'
- name: Build
run: |
$env:RUST_BACKTRACE=1
cd Vindicta-Addon
.\tools\buildv2.ps1
- uses: actions/upload-artifact@v1
with:
name: build
path: Vindicta-Addon/release

- name: Checkout the source code
uses: actions/checkout@master

- name: Build Missions
run: '.\tools\Builder\buildMissions.ps1 -verPatch ${{ github.run_number }}'

- name: Build addons
run: '.\tools\Builder\buildAddons.ps1'

- uses: actions/upload-artifact@v1
with:
name: dev
path: Vindicta-Addon/dev
name: MissionFiles
path: _build\missions\separatePBO

30 changes: 9 additions & 21 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ package-lock.json
#VSCODE
.vscode/ipch/*
.vscode/settings.json
Vindicta.Altis/.vscode/ipch/*
src/.vscode/ipch/*

#BUILD
_build
tools/_build
tools/_buildID.txt
*/src

#TEMP
temp
Expand All @@ -24,29 +25,16 @@ temp.sqf
mission.sqm.backup.at*

#MISSION
Vindicta.Altis/out/linecount.txt
Vindicta.Altis/out/linecount.json
Vindicta.Altis/mission.sqm
Vindicta.Altis/config/user_local_config.hpp
Vindicta.Enoch
Vindicta.Enoch/
Vindicta.Malden
Vindicta.Malden/
Vindicta.Tembelan
Vindicta.Tembelan/
Vindicta.Takistan
Vindicta.Takistan/
Vindicta.Staszow
Vindicta.Staszow/
Vindicta.Beketov
Vindicta.Beketov/
Vindicta.cup_chernarus_A3
Vindicta.cup_chernarus_A3/
Vindicta.gm_weferlingen_summer
Vindicta.gm_weferlingen_summer/
src/out/linecount.txt
src/out/linecount.json
src/config/user_local_config.hpp
~*
editing.*
*.preproc
Vindicta.*/init.sqf
Vindicta.*/cba_settings.sqf
Vindicta.*/onPlayerRespawn.sqf
Vindicta.*/description.ext

#ADDON

Expand Down
Loading

0 comments on commit 50ed6b6

Please sign in to comment.