1#!/bin/bash
2
3# update-spirvtools merges the latest changes from
4# the github.com/KhronosGroup/SPIRV-Tools into third_party/SPIRV-Tools.
5# This script copies the change descriptions from the squash change into the
6# top merge change, along with a standardized description.
7REASON=$1
8
9if [ ! -z "$REASON" ]; then
10  REASON="\n$REASON\n"
11fi
12
13THIRD_PARTY_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
14
15GIT_RESULT=`git subtree pull --prefix third_party/SPIRV-Tools https://github.com/KhronosGroup/SPIRV-Tools master --squash -m "Update SPIR-V Tools"`
16if [[ $GIT_RESULT == *"CONFLICT"* ]]; then
17  echo "subtree pull resulted in conflicts. Atempting to automatically resolve..."
18  # CONFLICT is very likely due to Android.mk being deleted in our third_party.
19  # Delete it, and try to continue.
20  git rm ${THIRD_PARTY_DIR}/SPIRV-Tools/Android.mk
21  git -c core.editor=true merge --continue # '-c core.editor=true' prevents the editor from showing
22  if [ $? -ne 0 ]; then
23    echo "Could not automatically resolve conflicts."
24    exit 1
25  fi
26fi
27
28
29ALL_CHANGES=`git log -n 1 HEAD^2 | egrep '^(\s{4}[0-9a-f]{9}\s*.*)$'`
30HEAD_CHANGE=`echo "$ALL_CHANGES" | egrep '[0-9a-f]{9}' -o -m 1`
31LOG_MSG=`echo -e "Update SPIR-V Tools to $HEAD_CHANGE\n${REASON}\nChanges:\n$ALL_CHANGES\n\nCommands:\n    ./third_party/update-spirvtools.sh\n\nBug: b/123642959"`
32git commit --amend -m "$LOG_MSG"
33