Commit 747dd6ca authored by Manuel Moos's avatar Manuel Moos
Browse files

Flatpak: just update build definition git repository

parent 77f25a53
Pipeline #234643375 passed with stages
in 22 minutes and 9 seconds
......@@ -679,20 +679,12 @@ result.deploy_zi: context.deploy_zi deploy_external result.deploy_download
+$(srcdir)/context_to_result.sh $@.dir ./deploy_zeroinstall.sh
echo > $@
context.update_fp: context.deploy_base_flatpak ${srcdir}/../deploy/*_flatpak.sh
context.deploy_fp: context.deploy_base_flatpak ${srcdir}/../deploy/*_flatpak.sh
${srcdir}/prepare_context.sh $@.dir $<.dir/'*' ${srcdir}/../deploy/*_flatpak.sh
rm -f $@.dir/image
echo "armadeploy_64" > $@.dir/image
echo > $@
result.update_fp: context.update_fp
+$(srcdir)/context_to_result.sh $@.dir ./update_flatpak.sh
echo > $@
context.deploy_fp: context.deploy_base_flatpak result.update_fp ${srcdir}/../deploy/*_flatpak.sh
${srcdir}/prepare_context.sh $@.dir $<.dir/'*' result.update_fp.dir/flatpak ${srcdir}/../deploy/*_flatpak.sh
rm -f $@.dir/image
echo "armadeploy_64" > $@.dir/image
echo > $@
result.deploy_fp: context.deploy_fp #deploy_external result.deploy_download
result.deploy_fp: context.deploy_fp deploy_external result.deploy_download
+$(srcdir)/context_to_result.sh $@.dir ./deploy_flatpak.sh
echo > $@
......
#!/bin/bash
# push flatpak definition
# update and push flatpak definition
set +x
......@@ -15,7 +15,29 @@ set -x
dd=`dirname $0`
pushd flatpak
trust_gitlab || exit $?
git clone ${FP_GIT} flatpak || exit $?
BRANCH_BASE=${ZI_SERIES}
case ${ZI_SERIES}+${SUFFIX}+@version@ in
wip+*+*)
BRANCH_BASE="legacy"
;;
alpha+*+*)
BRANCH_BASE="legacy"
;;
esac
pushd flatpak || exit $?
git checkout ${BRANCH_BASE}_0.2.9 || exit $?
FILENAME=${PACKAGE_NAME}-${PACKAGE_VERSION}.tbz
# scary SED patch in new package source
SHA=`sha256sum ../upload/${FILENAME} | sed -e "s, .*,,"`
sed -i org.armagetronad.ArmagetronAdvanced.json -e \
"s~\\\"url\\\":.*armagetronad.*~\\\"url\\\": \\\"${DOWNLOAD_URI_BASE}${FILENAME}\\\",~" -e \
"s~\\\"sha256\\\":.*~\\\"sha256\\\": \\\"${SHA}\\\"~" || exit $?
git diff
CHANGED=`git status --short -uno | sed -e "s/^ . //"`
if test -z "${CHANGED}"; then
......@@ -24,16 +46,11 @@ if test -z "${CHANGED}"; then
fi
# commit and push
trust_gitlab
git pull || exit $?
git commit ${CHANGED} -m "Update to version ${PACKAGE_VERSION}" || exit $?
git commit . -m "Update to version ${PACKAGE_VERSION}" || exit $?
if ! test ${STAGING} == true; then
git push || exit $?
fi
popd
# cleanup
rm -rf source upload secrets secrets.*
exit ${EXIT}
#!/bin/bash
# update flatpak definition git with new files
set -x
#ls
#ls secrets
ls upload
set +x
mv secrets/ssh ~/.ssh
# import gpg keys; remove other secrets
EXIT=0
#gpg --import secrets/pub.gpg || EXIT=$?
#gpg --allow-secret-key-import --import secrets/sec.gpg || EXIT=$?
rm -rf secrets/*
#test ${EXIT} = 0 || exit ${EXIT}
dd=`dirname $0`
set -x
. ./version.sh || exit $?
. ./targets.sh || exit $?
trust_gitlab || exit $?
git clone ${FP_GIT} flatpak || exit $?
BRANCH_BASE=${ZI_SERIES}
case ${ZI_SERIES}+${SUFFIX}+@version@ in
wip+*+*)
BRANCH_BASE="legacy"
;;
alpha+*+*)
BRANCH_BASE="legacy"
;;
esac
ls
ls upload
pushd flatpak || exit $?
git checkout ${BRANCH_BASE}_0.2.9 || exit $?
FILENAME=${PACKAGE_NAME}-${PACKAGE_VERSION}.tbz
SHA=`sha256sum ../upload/${FILENAME} | sed -e "s, .*,,"`
sed -i org.armagetronad.ArmagetronAdvanced.json -e \
"s~\\\"url\\\":.*armagetronad.*~\\\"url\\\": \\\"${DOWNLOAD_URI_BASE}${FILENAME}\\\",~" -e \
"s~\\\"sha256\\\":.*~\\\"sha256\\\": \\\"${SHA}\\\"~" || exit $?
git diff
popd
rm -rf source upload
exit ${EXIT}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment