From 6feeec83c4909c2dcc26706c21f8481273b3d94e Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Tue, 11 Jan 2022 14:55:49 -0700 Subject: [PATCH 1/3] Fix locally --- tests/unit/getPullRequestsMergedBetweenTest.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/unit/getPullRequestsMergedBetweenTest.sh b/tests/unit/getPullRequestsMergedBetweenTest.sh index a8f9daa612d..9b5dd56a7cc 100755 --- a/tests/unit/getPullRequestsMergedBetweenTest.sh +++ b/tests/unit/getPullRequestsMergedBetweenTest.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Fail immediately if there is an error thrown +set -e + TEST_DIR=$(dirname "$(dirname "$(realpath "$0")")") DUMMY_DIR="$HOME/DumDumRepo" getPullRequestsMergedBetween="$TEST_DIR/utils/getPullRequestsMergedBetween.js" @@ -221,8 +224,8 @@ success "Bumped version to 1.1.1 on main!" info "Cherry picking PR #7 and the version bump to staging..." git checkout staging git checkout -b cherry-pick-staging-7 -git cherry-pick -S -x --mainline 1 --strategy=recursive -Xtheirs "$PR_7_MERGE_COMMIT" -git cherry-pick -S -x --mainline 1 "$VERSION_BUMP_MERGE_COMMIT" +git cherry-pick -x --mainline 1 --strategy=recursive -Xtheirs "$PR_7_MERGE_COMMIT" +git cherry-pick -x --mainline 1 "$VERSION_BUMP_MERGE_COMMIT" git checkout staging git merge cherry-pick-staging-7 --no-ff -m "Merge pull request #9 from Expensify/cherry-pick-staging-7" git branch -d cherry-pick-staging-7 From 6ad3957dfabd86ba0af0ce71754274ac83e90e55 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Tue, 11 Jan 2022 14:55:54 -0700 Subject: [PATCH 2/3] Add back to test workflow --- .github/workflows/test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ac8c3d76231..2d3a8824e34 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,6 +33,10 @@ jobs: max_attempts: 5 command: npm ci - - run: npm run test + - name: Jest Unit Tests + run: npm run test env: CI: true + + - name: Pull Request Tests + run: tests/unit/getPullRequestsMergedBetweenTest.sh From cb0f48bd2b24793f216c148d39b7db673f3ed5dd Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Tue, 11 Jan 2022 15:07:22 -0700 Subject: [PATCH 3/3] Add test git config --- tests/unit/getPullRequestsMergedBetweenTest.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/unit/getPullRequestsMergedBetweenTest.sh b/tests/unit/getPullRequestsMergedBetweenTest.sh index 9b5dd56a7cc..82c53ca6a44 100755 --- a/tests/unit/getPullRequestsMergedBetweenTest.sh +++ b/tests/unit/getPullRequestsMergedBetweenTest.sh @@ -56,6 +56,8 @@ fi info "Initializing Git repo..." git init -b main +git config user.email "test@test.com" +git config user.name "test" git add package.json package-lock.json git commit -m "Initial commit"