Make pushing to git optional

This commit is contained in:
Petr Mrázek 2020-03-28 12:37:55 +01:00
parent 716e33e15e
commit 7f8e8c056a
2 changed files with 26 additions and 21 deletions

View File

@ -8,6 +8,7 @@ export BRANCH_master=master
export BRANCH_develop=develop
export DEPLOY_TO_S3=false
export DEPLOY_TO_FOLDER=false
export DEPLOY_TO_GIT=false
export DEPLOY_FOLDER_master=/var/www/meta/v1/
export DEPLOY_FOLDER_develop=/var/www/meta/dev/
export DEPLOY_FOLDER_USER=http

View File

@ -43,16 +43,18 @@ cd "${BASEDIR}"
./updateFabric.py || fail_in
./updateLiteloader.py || fail_in
cd "${BASEDIR}/${UPSTREAM_DIR}"
git add mojang/version_manifest.json mojang/versions/* mojang/assets/* || fail_in
git add forge/*.json forge/version_manifests/*.json forge/installer_manifests/*.json forge/files_manifests/*.json || fail_in
git add fabric/loader-installer-json/*.json fabric/meta-v2/*.json fabric/jars/*.json || fail_in
git add liteloader/*.json || fail_in
if ! git diff --cached --exit-code ; then
git commit -a -m "Update ${currentDate}" || fail_in
GIT_SSH_COMMAND="ssh -i ${BASEDIR}/config/meta-upstream.key" git push || exit 1
if [ "${DEPLOY_TO_GIT}" = true ] ; then
cd "${BASEDIR}/${UPSTREAM_DIR}"
git add mojang/version_manifest.json mojang/versions/* mojang/assets/* || fail_in
git add forge/*.json forge/version_manifests/*.json forge/installer_manifests/*.json forge/files_manifests/*.json || fail_in
git add fabric/loader-installer-json/*.json fabric/meta-v2/*.json fabric/jars/*.json || fail_in
git add liteloader/*.json || fail_in
if ! git diff --cached --exit-code ; then
git commit -a -m "Update ${currentDate}" || fail_in
GIT_SSH_COMMAND="ssh -i ${BASEDIR}/config/meta-upstream.key" git push || exit 1
fi
cd "${BASEDIR}"
fi
cd "${BASEDIR}"
cd "${BASEDIR}/${MMC_DIR}"
git reset --hard HEAD || exit 1
@ -65,21 +67,23 @@ cd "${BASEDIR}"
./generateLiteloader.py || fail_out
./index.py || fail_out
cd "${BASEDIR}/${MMC_DIR}"
git add index.json org.lwjgl/* net.minecraft/* || fail_out
git add net.minecraftforge/* || fail_out
git add net.fabricmc.fabric-loader/* net.fabricmc.intermediary/* || fail_out
git add com.mumfrey.liteloader/* || fail_out
if [ -d "org.lwjgl3" ]; then
git add org.lwjgl3/* || fail_out
if [ "${DEPLOY_TO_GIT}" = true ] ; then
cd "${BASEDIR}/${MMC_DIR}"
git add index.json org.lwjgl/* net.minecraft/* || fail_out
git add net.minecraftforge/* || fail_out
git add net.fabricmc.fabric-loader/* net.fabricmc.intermediary/* || fail_out
git add com.mumfrey.liteloader/* || fail_out
if [ -d "org.lwjgl3" ]; then
git add org.lwjgl3/* || fail_out
fi
if ! git diff --cached --exit-code ; then
git commit -a -m "Update ${currentDate}" || fail_out
GIT_SSH_COMMAND="ssh -i ${BASEDIR}/config/meta-multimc.key" git push || exit 1
fi
fi
if ! git diff --cached --exit-code ; then
git commit -a -m "Update ${currentDate}" || fail_out
GIT_SSH_COMMAND="ssh -i ${BASEDIR}/config/meta-multimc.key" git push || exit 1
fi
cd "${BASEDIR}"
if [ "${DEPLOY_TO_FOLDER}" = true ] ; then
DEPLOY_FOLDER_var="DEPLOY_FOLDER_$MODE"
DEPLOY_FOLDER="${!DEPLOY_FOLDER_var}"