| Leonardo Sandoval | 9dfdd1b | 2020-08-06 17:08:11 -0500 | [diff] [blame] | 1 | #!/usr/bin/env bash |
| Zelalem | d36c2d9 | 2020-08-04 16:59:47 -0500 | [diff] [blame] | 2 | # |
| Paul Sokolovsky | 78b7445 | 2022-01-25 17:11:27 +0300 | [diff] [blame^] | 3 | # Copyright (c) 2020-2022, Arm Limited. All rights reserved. |
| Zelalem | d36c2d9 | 2020-08-04 16:59:47 -0500 | [diff] [blame] | 4 | # |
| 5 | # SPDX-License-Identifier: BSD-3-Clause |
| 6 | # |
| 7 | |
| 8 | # Fast forward master branch with integration |
| 9 | |
| Paul Sokolovsky | 105f385 | 2022-01-25 17:19:30 +0300 | [diff] [blame] | 10 | set -ex |
| Zelalem | d36c2d9 | 2020-08-04 16:59:47 -0500 | [diff] [blame] | 11 | |
| Paul Sokolovsky | 78b7445 | 2022-01-25 17:11:27 +0300 | [diff] [blame^] | 12 | # Use a directory which won't clash with a r/o clone made for building. |
| 13 | clone_dir=trusted-firmware-a-for-update |
| 14 | |
| 15 | git clone ssh://$CI_BOT_USERNAME@review.trustedfirmware.org:29418/TF-A/trusted-firmware-a ${clone_dir} |
| 16 | cd ${clone_dir} |
| Zelalem | d36c2d9 | 2020-08-04 16:59:47 -0500 | [diff] [blame] | 17 | git checkout master |
| 18 | git merge --ff-only origin/integration |
| Paul Sokolovsky | 105f385 | 2022-01-25 17:19:30 +0300 | [diff] [blame] | 19 | |
| 20 | # On OpenCI, disable push for now, until we're confident enough we want to do |
| 21 | # this automatically. See comments in https://linaro.atlassian.net/browse/TFC-223. |
| 22 | if echo "$JENKINS_URL" | grep -q "arm.com"; then |
| 23 | git push origin master |
| 24 | fi |
| 25 | |
| Zelalem | d36c2d9 | 2020-08-04 16:59:47 -0500 | [diff] [blame] | 26 | cd .. |
| Paul Sokolovsky | 78b7445 | 2022-01-25 17:11:27 +0300 | [diff] [blame^] | 27 | rm -rf ${clone_dir} |