| 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 | # |
| 3 | # Copyright (c) 2020, Arm Limited. All rights reserved. |
| 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 | |
| 12 | git clone ssh://$CI_BOT_USERNAME@review.trustedfirmware.org:29418/TF-A/trusted-firmware-a |
| 13 | cd trusted-firmware-a |
| 14 | git checkout master |
| 15 | git merge --ff-only origin/integration |
| Paul Sokolovsky | 105f385 | 2022-01-25 17:19:30 +0300 | [diff] [blame^] | 16 | |
| 17 | # On OpenCI, disable push for now, until we're confident enough we want to do |
| 18 | # this automatically. See comments in https://linaro.atlassian.net/browse/TFC-223. |
| 19 | if echo "$JENKINS_URL" | grep -q "arm.com"; then |
| 20 | git push origin master |
| 21 | fi |
| 22 | |
| Zelalem | d36c2d9 | 2020-08-04 16:59:47 -0500 | [diff] [blame] | 23 | cd .. |
| 24 | rm -rf trusted-firmware-a |