mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-24 10:27:10 +02:00
Chore: Website: Use only one commit per website update (#9558)
This commit is contained in:
parent
f7e64e9681
commit
674bbf9667
@ -72,13 +72,6 @@ CROWDIN_PERSONAL_TOKEN="$CROWDIN_PERSONAL_TOKEN" yarn crowdinDownload
|
|||||||
yarn buildWebsite
|
yarn buildWebsite
|
||||||
|
|
||||||
cd "$JOPLIN_WEBSITE_ROOT_DIR"
|
cd "$JOPLIN_WEBSITE_ROOT_DIR"
|
||||||
git add -A
|
|
||||||
git commit -m "Updated website
|
|
||||||
|
|
||||||
Auto-updated using $SCRIPT_NAME" || true
|
|
||||||
|
|
||||||
git pull --rebase
|
|
||||||
git push
|
|
||||||
|
|
||||||
# Copy and update the plugin website.
|
# Copy and update the plugin website.
|
||||||
#
|
#
|
||||||
@ -95,16 +88,17 @@ if [ -f "$BUILT_PLUGIN_WEBSITE_FILE" ]; then
|
|||||||
cd plugins
|
cd plugins
|
||||||
|
|
||||||
tar -xzvf "$BUILT_PLUGIN_WEBSITE_FILE"
|
tar -xzvf "$BUILT_PLUGIN_WEBSITE_FILE"
|
||||||
cd "$JOPLIN_WEBSITE_ROOT_DIR"
|
|
||||||
|
|
||||||
git add -A
|
|
||||||
git commit -m "Updated plugin discovery website
|
|
||||||
|
|
||||||
Auto-updated using $SCRIPT_NAME" || true
|
|
||||||
|
|
||||||
git pull --rebase
|
|
||||||
git push
|
|
||||||
else
|
else
|
||||||
echo "Not updating plugin website -- release ($BUILT_PLUGIN_WEBSITE_FILE) not present"
|
echo "Not updating plugin website -- release ($BUILT_PLUGIN_WEBSITE_FILE) not present"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
cd "$JOPLIN_WEBSITE_ROOT_DIR"
|
||||||
|
git add -A
|
||||||
|
git commit -m "Updated website
|
||||||
|
|
||||||
|
Auto-updated using $SCRIPT_NAME" || true
|
||||||
|
|
||||||
|
git pull --rebase
|
||||||
|
git push
|
||||||
|
Loading…
Reference in New Issue
Block a user