mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-21 09:38:01 +02:00
Chore: Fixed website builder, and added check to CI to verify that builder is not broken
This commit is contained in:
parent
90d75ce80e
commit
4337e2b79a
15
.github/scripts/run_ci.sh
vendored
15
.github/scripts/run_ci.sh
vendored
@ -171,6 +171,21 @@ if [ "$IS_PULL_REQUEST" == "1" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
# =============================================================================
|
||||
# Check that the website still builds
|
||||
# =============================================================================
|
||||
|
||||
if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
|
||||
echo "Step: Check that the website still builds..."
|
||||
|
||||
mkdir -p ../joplin-website/docs
|
||||
yarn run buildWebsite
|
||||
testResult=$?
|
||||
if [ $testResult -ne 0 ]; then
|
||||
exit $testResult
|
||||
fi
|
||||
fi
|
||||
|
||||
# =============================================================================
|
||||
# Find out if we should run the build or not. Electron-builder gets stuck when
|
||||
# building PRs so we disable it in this case. The Linux build should provide
|
||||
|
@ -465,7 +465,7 @@ PODS:
|
||||
- React-Core
|
||||
- RNCPushNotificationIOS (1.11.0):
|
||||
- React-Core
|
||||
- RNDateTimePicker (7.2.0):
|
||||
- RNDateTimePicker (7.3.0):
|
||||
- React-Core
|
||||
- RNDeviceInfo (10.6.1):
|
||||
- React-Core
|
||||
@ -849,7 +849,7 @@ SPEC CHECKSUMS:
|
||||
rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
|
||||
RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
|
||||
RNCPushNotificationIOS: 64218f3c776c03d7408284a819b2abfda1834bc8
|
||||
RNDateTimePicker: 3942382593f104af226ad9c56e16166960c7ae30
|
||||
RNDateTimePicker: 01e6d27ba2e0931cd05049c5bff6171c3c027ea8
|
||||
RNDeviceInfo: ab292735ad4fccc5f2aec0c773f7a7f03c7073ae
|
||||
RNExitApp: c4e052df2568b43bec8a37c7cd61194d4cfee2c3
|
||||
RNFileViewer: ce7ca3ac370e18554d35d6355cffd7c30437c592
|
||||
|
@ -6,6 +6,6 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"typedoc": "0.17.8",
|
||||
"typescript": "5.0.4"
|
||||
"typescript": "4.7.4"
|
||||
}
|
||||
}
|
||||
|
@ -26,8 +26,8 @@
|
||||
"packages/app-cli/tests/**",
|
||||
"packages/app-clipper/popup",
|
||||
"packages/app-mobile/android/app/build.gradle",
|
||||
"packages/generate-plugin-doc/**",
|
||||
"packages/plugins/**",
|
||||
"packages/react-native-vosk",
|
||||
],
|
||||
"ignoreDeps": [
|
||||
"@babel/core",
|
||||
|
26
yarn.lock
26
yarn.lock
@ -17397,7 +17397,7 @@ __metadata:
|
||||
resolution: "generate-plugin-doc@workspace:packages/generate-plugin-doc"
|
||||
dependencies:
|
||||
typedoc: 0.17.8
|
||||
typescript: 5.0.4
|
||||
typescript: 4.7.4
|
||||
languageName: unknown
|
||||
linkType: soft
|
||||
|
||||
@ -32899,7 +32899,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"typescript@npm:4 - 5, typescript@npm:5.0.4":
|
||||
"typescript@npm:4 - 5":
|
||||
version: 5.0.4
|
||||
resolution: "typescript@npm:5.0.4"
|
||||
bin:
|
||||
@ -32909,6 +32909,16 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"typescript@npm:4.7.4":
|
||||
version: 4.7.4
|
||||
resolution: "typescript@npm:4.7.4"
|
||||
bin:
|
||||
tsc: bin/tsc
|
||||
tsserver: bin/tsserver
|
||||
checksum: 5750181b1cd7e6482c4195825547e70f944114fb47e58e4aa7553e62f11b3f3173766aef9c281783edfd881f7b8299cf35e3ca8caebe73d8464528c907a164df
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"typescript@npm:5.1.3":
|
||||
version: 5.1.3
|
||||
resolution: "typescript@npm:5.1.3"
|
||||
@ -32939,7 +32949,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"typescript@patch:typescript@4 - 5#~builtin<compat/typescript>, typescript@patch:typescript@5.0.4#~builtin<compat/typescript>":
|
||||
"typescript@patch:typescript@4 - 5#~builtin<compat/typescript>":
|
||||
version: 5.0.4
|
||||
resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin<compat/typescript>::version=5.0.4&hash=ad5954"
|
||||
bin:
|
||||
@ -32949,6 +32959,16 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"typescript@patch:typescript@4.7.4#~builtin<compat/typescript>":
|
||||
version: 4.7.4
|
||||
resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin<compat/typescript>::version=4.7.4&hash=65a307"
|
||||
bin:
|
||||
tsc: bin/tsc
|
||||
tsserver: bin/tsserver
|
||||
checksum: 9096d8f6c16cb80ef3bf96fcbbd055bf1c4a43bd14f3b7be45a9fbe7ada46ec977f604d5feed3263b4f2aa7d4c7477ce5f9cd87de0d6feedec69a983f3a4f93e
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"typescript@patch:typescript@5.1.3#~builtin<compat/typescript>":
|
||||
version: 5.1.3
|
||||
resolution: "typescript@patch:typescript@npm%3A5.1.3#~builtin<compat/typescript>::version=5.1.3&hash=ad5954"
|
||||
|
Loading…
Reference in New Issue
Block a user