diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index cd4388da..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,37 +0,0 @@ -version: 2 -jobs: - validate: - docker: - - image: acemod/armake:master - steps: - - checkout - - run: - name: Validate SQF - command: python tools/sqf_validator.py - - run: - name: Validate Config style - command: python tools/config_style_checker.py - - build: - docker: - - image: circleci/node - steps: - - checkout - - run: - name: Install dependencies - command: npm install --loglevel=error - working_directory: ~/project/tools/buildtool - - run: - name: Pack PBOs - command: npx gulp - working_directory: ~/project/tools/buildtool - - store_artifacts: - path: ~/project/_build/pbo - destination: 'KP-Liberation' - -workflows: - version: 2 - build: - jobs: - - build - - validate diff --git a/.editorconfig b/.editorconfig index af1c2ff3..32b327c8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,5 +8,8 @@ indent_style = space indent_size = 4 trim_trailing_whitespace = true +[*.yml] +indent_size = 2 + [*.md] trim_trailing_whitespace = false diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..da2bfbbd --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,59 @@ +name: CI + +on: + push: + branches: + - master + - 'v0.97' + pull_request: ~ + +jobs: + test-sqflint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + + - uses: arma-actions/sqflint@v1.0 + name: Validate with SQFLint + with: + args: --exit '' --directory Missionframework + + test-ace-tools: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + + - uses: docker://python:3.7-alpine + name: Setup Python + + - run: | + python3 --version + python3 tools/sqf_validator.py + name: Validate with ACE SQF Validator + + - run: | + python3 --version + python3 tools/config_style_checker.py + name: Validate with ACE Config Style Checker + + artifacts: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + + - uses: docker://node:10-alpine + name: Setup Node + + - name: Install dependencies + working-directory: tools/buildtool + run: npm install --loglevel=error + + - name: Assemble and pack + working-directory: tools/buildtool + run: npx gulp + + - uses: actions/upload-artifact@master + with: + name: PBO-Files + path: _build/pbo +