From e7a1b08036ee69943338c6382fea5d9b513d8f38 Mon Sep 17 00:00:00 2001 From: Santeri Horttanainen Date: Wed, 21 Aug 2024 16:34:43 +0300 Subject: [PATCH] OPHLUDOS-205-1: Remove unpulled commits check Cringe --- infra/cdk.sh | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/infra/cdk.sh b/infra/cdk.sh index 96c7e24a5..ee69c9bba 100755 --- a/infra/cdk.sh +++ b/infra/cdk.sh @@ -2,30 +2,10 @@ source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../scripts/common-functions.sh" - - -ensure_no_missing_git_commits() { - if [ -n "${SKIP_MISSING_GIT_COMMITS_CHECK:-}" ]; then - echo "Skip checking that all commits in origin/main are present in HEAD" - else - echo "Checking all commits in origin/main are present in HEAD" - git fetch origin main || exit 1 - echo - local missing_git_commits - missing_git_commits=$(git log --oneline '^HEAD' 'origin/main') - if [ -n "$missing_git_commits" ]; then - echo "ERROR: origin/main has unpulled commits:" - echo "$missing_git_commits" - exit 1 - fi - fi -} - main() { use_correct_node_version npm_ci_if_package_lock_has_changed - ensure_no_missing_git_commits npx cdk --context envName="$ENV" "$@" } -main "$@" \ No newline at end of file +main "$@"