Browse Source

Merge branch 'master' into dev

Krzysztof Krysiński 5 years ago
parent
commit
7f5ef11e04
5 changed files with 22 additions and 2 deletions
  1. 16 0
      .github/ISSUE_TEMPLATE/report_a_bug.md
  2. 1 1
      CONTRIBUTING.md
  3. 1 0
      PULL_REQUEST_TEMPLATE.md
  4. 2 0
      README.md
  5. 2 1
      azure-pipelines.yml

+ 16 - 0
.github/ISSUE_TEMPLATE/report_a_bug.md

@@ -0,0 +1,16 @@
+---
+name: Report a bug
+about: Report a bug, not working feature or anything related
+---
+
+**Describe as detailed as possible when it happens**
+A clear and concise description of what the problem is. Ex. Holding CTRL+Z and P at the same time, causes program to crash  
+
+**Describe what you tried to do in order to fix it**
+A clear and concise description of what you tried to do to fix the problem (if possible).
+
+**Include screenshots of error**
+If it is possible, include screenshots, videos etc.
+
+**Additional context**
+Add any other context here.

+ 1 - 1
CONTRIBUTING.md

@@ -5,7 +5,7 @@ Hey! Thanks for being interested in project! It means a lot. But, before contrib
 When contributing to this repository, please first discuss the change you wish to make via issue,
 email, or any other method with the owners of this repository before making a change. 
 
-Please note we have a [code of conduct](https://github.com/flabbet/PixiEditor/blob/master/CODE_OF_CONDUCT), please follow it in all your interactions with the project.
+Please note we have a [code of conduct](https://github.com/flabbet/PixiEditor/blob/master/CODE_OF_CONDUCT.md), please follow it in all your interactions with the project.
 
 ## Issues
 

+ 1 - 0
PULL_REQUEST_TEMPLATE.md

@@ -5,3 +5,4 @@
  1. Clearly describe changes, as detailed as possible
  2. If possible, show examples of usage
  3. Ensure any install or build dependencies are removed before the end of the layer when doing a build.
+ 4. Make sure all tests are passing.

+ 2 - 0
README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://dev.azure.com/flabbet/PixiEditor/_apis/build/status/flabbet.PixiEditor?branchName=master)](https://dev.azure.com/flabbet/PixiEditor/_build/latest?definitionId=3&branchName=master)
+
 # PixiEditor
 Pixi is lightweighted pixel art creator.
 

+ 2 - 1
azure-pipelines.yml

@@ -1,5 +1,6 @@
 trigger:
 - dev
+- master
 
 pool:
   vmImage: 'windows-latest'
@@ -26,5 +27,5 @@ steps:
   displayName: Tests
   inputs:
     command: test
-    projects: '**/*Tests/*.csproj'  
+    projects: '**/*Tests/*.csproj'
     arguments: '--configuration $(buildConfiguration) --collect "Code coverage"'