diff mbox series

Revert "CI: switch to building against styhead branches where possible"

Message ID 20241001150948.3543360-1-jon.mason@arm.com
State New
Headers show
Series Revert "CI: switch to building against styhead branches where possible" | expand

Commit Message

Jon Mason Oct. 1, 2024, 3:09 p.m. UTC 
This reverts commit 2b1348d74f9fb4e49ece3a8a0107307ec432f392.

Revert to allow the meta-arm master branch to use the master branch of
other layers.
---
 ci/base.yml                | 2 +-
 ci/clang.yml               | 1 -
 ci/meta-secure-core.yml    | 1 -
 ci/meta-virtualization.yml | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/ci/base.yml b/ci/base.yml
index 7b550dbfa283..d1c933d027ae 100644
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -7,7 +7,7 @@  distro: poky
 
 defaults:
   repos:
-    branch: styhead
+    branch: master
 
 repos:
   meta-arm:
diff --git a/ci/clang.yml b/ci/clang.yml
index 7dd5d522a162..402292a6b86d 100644
--- a/ci/clang.yml
+++ b/ci/clang.yml
@@ -6,7 +6,6 @@  header:
 repos:
   meta-clang:
     url: https://github.com/kraj/meta-clang
-    branch: master
 
 local_conf_header:
   toolchain: |
diff --git a/ci/meta-secure-core.yml b/ci/meta-secure-core.yml
index 81280e737575..b34562b267cc 100644
--- a/ci/meta-secure-core.yml
+++ b/ci/meta-secure-core.yml
@@ -6,7 +6,6 @@  header:
 repos:
   meta-secure-core:
     url: https://github.com/Wind-River/meta-secure-core.git
-    branch: master
     layers:
       meta-secure-core-common:
       meta-signing-key:
diff --git a/ci/meta-virtualization.yml b/ci/meta-virtualization.yml
index d699d70a7fa3..c0ba70ba8e52 100644
--- a/ci/meta-virtualization.yml
+++ b/ci/meta-virtualization.yml
@@ -8,4 +8,3 @@  header:
 repos:
   meta-virtualization:
     url: https://git.yoctoproject.org/meta-virtualization
-    branch: master