1
0
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:
Henry Heino 2023-12-20 11:08:57 -08:00 committed by GitHub
parent f7e64e9681
commit 674bbf9667
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -72,13 +72,6 @@ CROWDIN_PERSONAL_TOKEN="$CROWDIN_PERSONAL_TOKEN" yarn crowdinDownload
yarn buildWebsite
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.
#
@ -95,16 +88,17 @@ if [ -f "$BUILT_PLUGIN_WEBSITE_FILE" ]; then
cd plugins
tar -xzvf "$BUILT_PLUGIN_WEBSITE_FILE"
cd "$JOPLIN_WEBSITE_ROOT_DIR"
else
echo "Not updating plugin website -- release ($BUILT_PLUGIN_WEBSITE_FILE) not present"
exit 1
fi
cd "$JOPLIN_WEBSITE_ROOT_DIR"
git add -A
git commit -m "Updated plugin discovery website
git commit -m "Updated website
Auto-updated using $SCRIPT_NAME" || true
git pull --rebase
git push
else
echo "Not updating plugin website -- release ($BUILT_PLUGIN_WEBSITE_FILE) not present"
exit 1
fi