From 3a4638f14dcb7efcfa1e2e5b07e8eca07e8ed4cc Mon Sep 17 00:00:00 2001
From: Philippe Tillet <phil@openai.com>
Date: Sat, 6 Feb 2021 17:09:06 -0500
Subject: [PATCH] [CI] Updated trigger rules and status badge link

---
 .ci/azure-pipelines.yml | 13 +++++++++++++
 README.md               |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml
index 8fcb0b3d5..52767cfaa 100644
--- a/.ci/azure-pipelines.yml
+++ b/.ci/azure-pipelines.yml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Python package
 # Create and test a Python package on multiple Python versions.
 # Add steps that analyze code, save the dist with the build record, publish to a PyPI-compatible index, and more:
@@ -9,19 +10,31 @@ name: Triton CI
 pr:
 - master
 
+=======
+name: Triton CI
+>>>>>>> [CI] Updated trigger rule and status badge link
 pool:
   name: default
 
+# Some variables
 variables:
 - name: venv
   value: venv
 
+# Run CI when something pushed to master
+trigger: [ master ]
+# Run CI when a PR is created or updated from master
+pr:
+- master
+
+# Python version
 strategy:
   matrix:
     Python37:
       python.version: '3.7'
   maxParallel: 1
 
+# Pipeline
 steps:
 - script: |
     mkdir $(venv)
diff --git a/README.md b/README.md
index 65cf14607..a38ef7f87 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 This is the development repository of Triton, a language and compiler for writing highly efficient custom Deep-Learning primitives. The aim of Triton is to provide an open-source environment to write fast code at higher productivity than CUDA, but also with higher flexibility than other existing DSLs.
 
-[![Build Status](https://dev.azure.com/phil0342/Triton/_apis/build/status/ptillet.triton?branchName=refs%2Fpull%2F58%2Fmerge)](https://dev.azure.com/phil0342/Triton/_build/latest?definitionId=6&branchName=refs%2Fpull%2F58%2Fmerge)
+[![Build Status](https://dev.azure.com/phil0342/Triton/_apis/build/status/ptillet.triton?branchName=master)](https://dev.azure.com/phil0342/Triton/_build/latest?definitionId=7&branchName=master)
 
 The foundations of this project are described in the following MAPL2019 publication: [Triton: An Intermediate Language and Compiler for Tiled Neural Network Computations](http://www.eecs.harvard.edu/~htk/publication/2019-mapl-tillet-kung-cox.pdf). Please consider citing us if you use our work!