blob: bbdfa5145fcba92b55bbe18ef589d31908d41303 [file] [log] [blame]
Leonardo Sandoval9dfdd1b2020-08-06 17:08:11 -05001#!/usr/bin/env bash
Zelalemd36c2d92020-08-04 16:59:47 -05002#
Paul Sokolovsky78b74452022-01-25 17:11:27 +03003# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
Zelalemd36c2d92020-08-04 16:59:47 -05004#
5# SPDX-License-Identifier: BSD-3-Clause
6#
7
8# Fast forward master branch with integration
9
Paul Sokolovsky105f3852022-01-25 17:19:30 +030010set -ex
Zelalemd36c2d92020-08-04 16:59:47 -050011
Paul Sokolovsky3576aa22022-01-28 21:32:36 +030012mkdir -p ~/.ssh/
13ssh-keyscan -p 29418 review.trustedfirmware.org >> ~/.ssh/known_hosts
14export GIT_SSH_COMMAND="ssh -i $CI_BOT_KEY"
15
Paul Sokolovsky78b74452022-01-25 17:11:27 +030016# Use a directory which won't clash with a r/o clone made for building.
17clone_dir=trusted-firmware-a-for-update
18
19git clone ssh://$CI_BOT_USERNAME@review.trustedfirmware.org:29418/TF-A/trusted-firmware-a ${clone_dir}
20cd ${clone_dir}
Zelalemd36c2d92020-08-04 16:59:47 -050021git checkout master
22git merge --ff-only origin/integration
Manish V Badarkhe22705802022-12-19 15:38:09 +000023
24# On OpenCI, disable push for now, until we're confident enough we want to do
25# this automatically. See comments in https://linaro.atlassian.net/browse/TFC-223.
26if echo "$JENKINS_URL" | grep -q "oss.arm.com"; then
27 git push origin master
28fi
Paul Sokolovsky105f3852022-01-25 17:19:30 +030029
Zelalemd36c2d92020-08-04 16:59:47 -050030cd ..
Paul Sokolovsky78b74452022-01-25 17:11:27 +030031rm -rf ${clone_dir}