From 1c7139c2633c7a6be1415dafb89ef340b4fb33a5 Mon Sep 17 00:00:00 2001
From: "alexandr.kravchenko" <alexander.kravchenko@demlabs.net>
Date: Sat, 8 Feb 2020 17:31:04 +0500
Subject: [PATCH] uncommented post-build script
---
prod_build/general/chroot_wrap.sh | 2 +-
prod_build/general/chroot_wrap.sh.save | 46 --------------------------
2 files changed, 1 insertion(+), 47 deletions(-)
delete mode 100755 prod_build/general/chroot_wrap.sh.save
diff --git a/prod_build/general/chroot_wrap.sh b/prod_build/general/chroot_wrap.sh
index de2e889b..f1f33df6 100755
--- a/prod_build/general/chroot_wrap.sh
+++ b/prod_build/general/chroot_wrap.sh
@@ -38,7 +38,7 @@ for platform in $PLATFORMS; do
fi
done
done
-# [ -e prod_build/$platform/scripts/post-build.sh ] && prod_build/$platform/scripts/post-build.sh #For post-build actions not in chroot (global publish)
+ [ -e prod_build/$platform/scripts/post-build.sh ] && prod_build/$platform/scripts/post-build.sh #For post-build actions not in chroot (global publish)
PKG_FORMAT=$(echo $PKG_FORMAT | cut -d ' ' -f2-)
# export_variables clean
done
diff --git a/prod_build/general/chroot_wrap.sh.save b/prod_build/general/chroot_wrap.sh.save
deleted file mode 100755
index 53a387fe..00000000
--- a/prod_build/general/chroot_wrap.sh.save
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-export_variables() {
-
-IFS=$'\n'
-for variable in $(cat prod_build/$platform/conf/*); do
- [ -z $1 ] && export $(echo "$variable" | sed 's/\"//g') || export -n $(echo $variable | cut -d '=' -f1)
-done
-
-}
-
-CHROOT_PREFIX="builder"
-CHROOTS_PATH=$1
-PLATFORMS=$2
-PKG_FORMAT=$3
-SRC_PATH=$4
-JOB=$5
-
-cd $SRC_PATH
-
-
-
-for platform in $PLATFORMS; do
- export_variables
- IFS=' '
- PKG_TYPE=$(echo $PKG_FORMAT | cut -d ' ' -f1)
- #Check if chroots are present
- echo $HOST_DISTR_VERSIONS
- echo $HOST_ARCH_VERSIONS
- [ -e prod_build/$platform/scripts/pre-build.sh ] && prod_build/$platform/scripts/pre-build.sh #For actions not in chroot (like version update)
- for distr in $HOST_DISTR_VERSIONS; do
- for arch in $HOST_ARCH_VERSIONS; do
- if [ -e $CHROOTS_PATH/$CHROOT_PREFIX-$distr-$arch ]; then
- schroot -c $CHROOT_PREFIX-$distr-$arch -- launcher.sh prod_build/$platform/scripts/$JOB.sh $PKG_TYPE || errcode=$?
- else
- echo "chroot $CHROOT_PREFIX-$distr-$arch not found. You should install it first"
- fi
- done
- done
- [ -e prod_build/$platform/scripts/post-build.sh ] && prod_build/$platform/scripts/post-build.sh #For post-build actions not in chroot (like global publish)
- PKG_FORMAT=$(echo $PKG_FORMAT | cut -d ' ' -f2-)
- export_variables clean
-done
-[ $(mount | grep "/run/schroot/mount") ] && sudo umount -l /run/schroot/mount && sudo rm -r /run/schroot/mount/* #Removing mountpoint odds.
-
-cd $wd
--
GitLab