Jingga/Build
1
0
Fork 0
mirror of https://github.com/Karaka-Management/Build.git synced 2026-01-10 19:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

prepare master merge

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-24 23:37:15 +00:00
parent 6a07de9243
commit fa3073cc1b
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Helper/Scripts/release.sh
View File

@ -5,7 +5,7 @@ echo "# Build develop"
echo "#################################################"
git submodule foreach "git checkout develop || true"
git submodule foreach git pull
git submodule foreach "git pull || true"
git checkout develop
git pull
@ -19,7 +19,7 @@ echo "#################################################"
git submodule foreach git add .
git submodule foreach "git commit -m 'Preparing for master update' || true"
git submodule foreach git push
git submodule foreach "git push || true"
echo "#################################################"
echo "# Update develop main repo"
@ -33,8 +33,8 @@ echo "#################################################"
echo "# Switch to master"
echo "#################################################"
git submodule foreach git checkout master
git submodule foreach git pull
git submodule foreach "git checkout master || true"
git submodule foreach "git pull || true"
git checkout master
git pull
@ -43,12 +43,12 @@ echo "#################################################"
echo "# Merge develop"
echo "#################################################"
git submodule foreach git merge develop
git submodule foreach "git merge develop || true"
git merge develop
git submodule foreach git add .
git submodule foreach "git commit -m 'Update master' || true"
git submodule foreach git push
git submodule foreach "git push || true"
git add .
git commit -m "Update master"

4
LICENSE.txt
View File

@ -46,3 +46,7 @@ Unless required by applicable law or agreed to in writing, Licensor provides the
7. Limitation of Liability
In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
8. Future Changes
The Licensor may change the License for future versions as he sees fit.