From 48748f1617f77d805ab5d8cefbf4f693b9dff622 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Tue, 8 Dec 2020 15:49:45 +0000 Subject: [PATCH] Backport PR #38360: CI: activate azure pipelines/github actions on 1.2.x --- .github/workflows/ci.yml | 2 +- azure-pipelines.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c00cec450c85e..2848437a76a16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: pull_request: branches: - master - - 1.1.x + - 1.2.x env: ENV_FILE: environment.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c49742095e1d8..464bad7884362 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,11 +1,11 @@ # Adapted from https://github.com/numba/numba/blob/master/azure-pipelines.yml trigger: - master -- 1.1.x +- 1.2.x pr: - master -- 1.1.x +- 1.2.x variables: PYTEST_WORKERS: auto