diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2021-08-10 11:49:41 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-08-11 02:42:31 +0000 |
| commit | fbc065d247d8ab8e357cd42093b5ac27a69e9167 (patch) | |
| tree | daf001ab1f4bd0805ebe03e561097a0d6b572d85 | |
| parent | 67a08d2ff371a653190227fe30bfa250174b1d65 (diff) | |
| download | chrome-ec-fbc065d247d8ab8e357cd42093b5ac27a69e9167.tar.gz | |
zephyr: update gitlab external CI to use v2.6 on all builds
2.5 support is going away. Drop any builds which use 2.5 still.
BUG=b:195571108
BRANCH=none
TEST=gitlab pipeline results UI
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I9f18f934db9267e3f074c82fa6f64c603c62b842
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3086364
Commit-Queue: Keith Short <keithshort@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | .gitlab-ci.yml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0058ec618..cd0133deb2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,10 +31,9 @@ before_script: - export MODULES_DIR="$HOME/modules" - mkdir -p "${MODULES_DIR}" - export ZEPHYR_BASE="$HOME/zephyr" - - git clone -b chromeos-v2.5 https://chromium.googlesource.com/chromiumos/third_party/zephyr "${ZEPHYR_BASE}25" - git clone -b chromeos-v2.6 https://chromium.googlesource.com/chromiumos/third_party/zephyr "${ZEPHYR_BASE}26" - - git clone -b chromeos-v2.5 https://chromium.googlesource.com/chromiumos/third_party/zephyr/cmsis "${MODULES_DIR}/cmsis" - - git clone -b chromeos-v2.5 https://chromium.googlesource.com/chromiumos/third_party/zephyr/hal_stm32 "${MODULES_DIR}/hal_stm32" + - git clone -b chromeos-main https://chromium.googlesource.com/chromiumos/third_party/zephyr/cmsis "${MODULES_DIR}/cmsis" + - git clone -b chromeos-main https://chromium.googlesource.com/chromiumos/third_party/zephyr/hal_stm32 "${MODULES_DIR}/hal_stm32" - ln -s "$(pwd)" "${MODULES_DIR}/ec" - python3 -V # Print out python version for debugging - python3 -m pip install zephyr/zmake --user @@ -63,7 +62,7 @@ delbin: variables: PROJECT: "delbin" PROJECT_SUBDIR: "volteer/" - VERSION: 25 + VERSION: 26 <<: *build_template hayato: @@ -82,26 +81,26 @@ it8xxx2_evb: kohaku: variables: PROJECT: "kohaku" - VERSION: 25 + VERSION: 26 <<: *build_template lazor: variables: PROJECT: "lazor" PROJECT_SUBDIR: "trogdor/" - VERSION: 25 + VERSION: 26 <<: *build_template native_posix: variables: PROJECT: "posix-ec" TOOLCHAIN: "host" - VERSION: 25 + VERSION: 26 <<: *build_template volteer: variables: PROJECT: "volteer" PROJECT_SUBDIR: "volteer/" - VERSION: 25 + VERSION: 26 <<: *build_template |