mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-24 10:27:10 +02:00
Tools: Fixed building macOS app on CI
This commit is contained in:
parent
e9514e742b
commit
e3de158d18
48
.github/scripts/run_ci.sh
vendored
48
.github/scripts/run_ci.sh
vendored
@ -19,12 +19,6 @@ if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
|
|||||||
IS_PULL_REQUEST=1
|
IS_PULL_REQUEST=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# In some case it might not be possible to detect if we're on a pull request, for example when
|
|
||||||
# pushing new code to an existing code (or maybe when pressing "Update branch" from GitHub). In that
|
|
||||||
# case "GITHUB_EVENT_NAME" is "push" it's not clear what else could be checked. It seems safe to
|
|
||||||
# always run the checks anyway so we do this for now.
|
|
||||||
IS_PULL_REQUEST=1
|
|
||||||
|
|
||||||
if [[ $GIT_TAG_NAME = $SERVER_TAG_PREFIX-* ]]; then
|
if [[ $GIT_TAG_NAME = $SERVER_TAG_PREFIX-* ]]; then
|
||||||
IS_SERVER_RELEASE=1
|
IS_SERVER_RELEASE=1
|
||||||
fi
|
fi
|
||||||
@ -147,15 +141,13 @@ fi
|
|||||||
# for Linux only is sufficient.
|
# for Linux only is sufficient.
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
|
|
||||||
if [ "$IS_PULL_REQUEST" == "1" ]; then
|
if [ "$IS_LINUX" == "1" ]; then
|
||||||
if [ "$IS_LINUX" == "1" ]; then
|
echo "Step: Validating translations..."
|
||||||
echo "Step: Validating translations..."
|
|
||||||
|
|
||||||
node packages/tools/validate-translation.js
|
node packages/tools/validate-translation.js
|
||||||
testResult=$?
|
testResult=$?
|
||||||
if [ $testResult -ne 0 ]; then
|
if [ $testResult -ne 0 ]; then
|
||||||
exit $testResult
|
exit $testResult
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -185,15 +177,13 @@ fi
|
|||||||
# See coding_style.md
|
# See coding_style.md
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
|
|
||||||
if [ "$IS_PULL_REQUEST" == "1" ]; then
|
if [ "$IS_LINUX" == "1" ]; then
|
||||||
if [ "$IS_LINUX" == "1" ]; then
|
echo "Step: Checking for files that should have been ignored..."
|
||||||
echo "Step: Checking for files that should have been ignored..."
|
|
||||||
|
|
||||||
node packages/tools/checkIgnoredFiles.js
|
node packages/tools/checkIgnoredFiles.js
|
||||||
testResult=$?
|
testResult=$?
|
||||||
if [ $testResult -ne 0 ]; then
|
if [ $testResult -ne 0 ]; then
|
||||||
exit $testResult
|
exit $testResult
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -219,15 +209,13 @@ fi
|
|||||||
# Spellchecking
|
# Spellchecking
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
|
|
||||||
if [ "$IS_PULL_REQUEST" == "1" ]; then
|
if [ "$IS_LINUX" == "1" ]; then
|
||||||
if [ "$IS_LINUX" == "1" ]; then
|
echo "Step: Spellchecking..."
|
||||||
echo "Step: Spellchecking..."
|
|
||||||
|
|
||||||
yarn spellcheck --all
|
yarn spellcheck --all
|
||||||
testResult=$?
|
testResult=$?
|
||||||
if [ $testResult -ne 0 ]; then
|
if [ $testResult -ne 0 ]; then
|
||||||
exit $testResult
|
exit $testResult
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user