summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2021-07-08 12:45:07 +0200
committerMartin Braun <martin.braun@ettus.com>2021-07-08 12:45:32 +0200
commit3bc9ab83d102f58a5a3af25ee3666bb23ae194e7 (patch)
tree005bbaa70b3f221fbb1ac990726465f4df189260
parentuhd: Prepare branch for 4.1.0.0 release (diff)
downloaduhd-3bc9ab83d102f58a5a3af25ee3666bb23ae194e7.tar.xz
uhd-3bc9ab83d102f58a5a3af25ee3666bb23ae194e7.zip
ci: Change base branch to UHD-4.1
-rw-r--r--.ci/oe-for-host.yml4
-rw-r--r--.ci/oe-x4xx-packages.yml4
-rw-r--r--.ci/uhd-build-docker-container.yml4
-rw-r--r--.ci/uhd-pipeline.yml6
-rw-r--r--.ci/x4xx-devtests.yml2
5 files changed, 10 insertions, 10 deletions
diff --git a/.ci/oe-for-host.yml b/.ci/oe-for-host.yml
index c2d2a48ec..c3cc80609 100644
--- a/.ci/oe-for-host.yml
+++ b/.ci/oe-for-host.yml
@@ -21,7 +21,7 @@
trigger:
branches:
include:
- - master
+ - UHD-4.1
paths:
include:
- .ci
@@ -30,7 +30,7 @@ trigger:
pr:
branches:
include:
- - master
+ - UHD-4.1
paths:
include:
- .ci
diff --git a/.ci/oe-x4xx-packages.yml b/.ci/oe-x4xx-packages.yml
index 27c29b015..cdf8299e4 100644
--- a/.ci/oe-x4xx-packages.yml
+++ b/.ci/oe-x4xx-packages.yml
@@ -17,7 +17,7 @@
trigger:
branches:
include:
- - master
+ - UHD-4.1
paths:
include:
- .ci
@@ -28,7 +28,7 @@ trigger:
pr:
branches:
include:
- - master
+ - UHD-4.1
paths:
include:
- .ci
diff --git a/.ci/uhd-build-docker-container.yml b/.ci/uhd-build-docker-container.yml
index 8712a5f58..94d5bf2d4 100644
--- a/.ci/uhd-build-docker-container.yml
+++ b/.ci/uhd-build-docker-container.yml
@@ -6,7 +6,7 @@
trigger:
branches:
include:
- - master
+ - UHD-4.1
paths:
include:
- .ci/docker
@@ -14,7 +14,7 @@ trigger:
pr:
branches:
include:
- - master
+ - UHD-4.1
paths:
include:
- .ci/docker
diff --git a/.ci/uhd-pipeline.yml b/.ci/uhd-pipeline.yml
index 73291d346..ae8342d9a 100644
--- a/.ci/uhd-pipeline.yml
+++ b/.ci/uhd-pipeline.yml
@@ -7,7 +7,7 @@
trigger:
branches:
include:
- - master
+ - UHD-4.1
paths:
include:
- host
@@ -16,7 +16,7 @@ trigger:
pr:
branches:
include:
- - master
+ - UHD-4.1
paths:
include:
- host
@@ -30,7 +30,7 @@ resources:
pipelines:
- pipeline: uhd_build_docker_container
source: 'uhddev Build Docker Containers'
- branch: master
+ branch: UHD-4.1
stages:
- stage: build_uhd_stage
displayName: Build UHD
diff --git a/.ci/x4xx-devtests.yml b/.ci/x4xx-devtests.yml
index 780d46ec8..69fac590e 100644
--- a/.ci/x4xx-devtests.yml
+++ b/.ci/x4xx-devtests.yml
@@ -22,7 +22,7 @@ resources:
pipelines:
- pipeline: 'x4xx-uhddev-oe-for-host-artifacts'
source: 'x4xx-uhddev-oe-for-host'
- branch: master
+ branch: UHD-4.1
trigger:
# workaround if no additional branch filter is specified
enabled: True