diff --git a/hack/deploy_impacted.sh b/hack/deploy_impacted.sh index 68c4dec5..43ea9107 100755 --- a/hack/deploy_impacted.sh +++ b/hack/deploy_impacted.sh @@ -12,7 +12,7 @@ return_if_impacted_targets_empty aws eks --region us-east-2 update-kubeconfig --name peridot-T8WbrA AWS_JWT="$(aws ecr get-login-password --region us-east-2)" -B64_AWS_AUTH="$(echo -n "AWS:$AWS_JWT")" +B64_AWS_AUTH="$(echo -n "AWS:$AWS_JWT" | base64)" mkdir -p ~/.docker echo '{"auths":{"893168113496.dkr.ecr.us-east-2.amazonaws.com":{"auth":"'"$B64_AWS_AUTH"'"}}}' > ~/.docker/config.json diff --git a/hack/get_impacted_targets.sh b/hack/get_impacted_targets.sh index c393f4aa..f8bd45d2 100755 --- a/hack/get_impacted_targets.sh +++ b/hack/get_impacted_targets.sh @@ -12,7 +12,7 @@ $BAZEL_B //:bazel-diff BASE_HASH="$PULL_BASE_SHA" TARGET_HASH="$PULL_PULL_SHA" if [[ -z "$TARGET_HASH" ]]; then - BASE_HASH="$(git log --pretty=format:"%H" --merges -n 1)" + BASE_HASH="$(git log "HEAD@{1}" --pretty=format:"%H" --merges -n 1)" TARGET_HASH="$PULL_BASE_SHA" fi