summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/Packaging')
-rwxr-xr-xSwift/Packaging/Debian/Testing/swift-distr-tests.sh16
-rwxr-xr-xSwift/Packaging/Debian/package_all_platforms.sh2
-rw-r--r--Swift/Packaging/Debian/update_debian_repo.sh2
3 files changed, 13 insertions, 7 deletions
diff --git a/Swift/Packaging/Debian/Testing/swift-distr-tests.sh b/Swift/Packaging/Debian/Testing/swift-distr-tests.sh
index 8d03282..e817974 100755
--- a/Swift/Packaging/Debian/Testing/swift-distr-tests.sh
+++ b/Swift/Packaging/Debian/Testing/swift-distr-tests.sh
@@ -34,37 +34,43 @@ else
CLEAN_INSTALL=False
fi
declare -A arr
#Ubuntu xenial
arr[0,0]="ubuntu"
arr[0,1]="http://archive.ubuntu.com/ubuntu"
arr[0,2]="xenial"
-#Ubuntu yakkety
+#Ubuntu artful
arr[1,0]="ubuntu"
arr[1,1]="http://archive.ubuntu.com/ubuntu"
-arr[1,2]="yakkety"
+arr[1,2]="artful"
#Debian jessie
arr[2,0]="debian"
arr[2,1]="http://deb.debian.org/debian/"
arr[2,2]="jessie"
-#Debian sid
+#Debian stretch
arr[3,0]="debian"
arr[3,1]="http://deb.debian.org/debian/"
-arr[3,2]="sid"
+arr[3,2]="stretch"
+
+#Debian sid
+arr[4,0]="debian"
+arr[4,1]="http://deb.debian.org/debian/"
+arr[4,2]="sid"
+
DIST="$1"
RETURN_VALUE=0
-for counter in {0..3}
+for counter in {0..4}
do
# for ARCH in "amd64" "i386"
for ARCH in "amd64"
do
echo "========================================"
echo "Testing ${arr[${counter},0]} ${arr[${counter},2]} $ARCH"
echo "========================================"
DIST_FOLDER="Debian-Tests/${arr[${counter},0]}_${arr[${counter},2]}_$ARCH"
if [ "$CLEAN_INSTALL" = True ] ; then
diff --git a/Swift/Packaging/Debian/package_all_platforms.sh b/Swift/Packaging/Debian/package_all_platforms.sh
index a61201d..afd0621 100755
--- a/Swift/Packaging/Debian/package_all_platforms.sh
+++ b/Swift/Packaging/Debian/package_all_platforms.sh
@@ -20,19 +20,19 @@ export SWIFT_FORCE_LUCID="yep"
# pbuilder-dist $distro $arch build *.dsc
# done
#done
unset SWIFT_FORCE_LUCID
./package.sh
if [ -z ${SWIFT_PACKAGE_PLATFORMS+x} ];
then
- platformsarray=( xenial yakkety jessie sid )
+ platformsarray=( xenial artful jessie stretch sid )
else
platformsarray=( $SWIFT_PACKAGE_PLATFORMS )
fi
for distro in "${platformsarray[@]}"; do
for arch in amd64; do
pbuilder-dist $distro $arch build *.dsc
done
done
diff --git a/Swift/Packaging/Debian/update_debian_repo.sh b/Swift/Packaging/Debian/update_debian_repo.sh
index db9f326..b057103 100644
--- a/Swift/Packaging/Debian/update_debian_repo.sh
+++ b/Swift/Packaging/Debian/update_debian_repo.sh
@@ -68,19 +68,19 @@ Permit: unused_files older_version
EOM
}
# check for existence of reprepro command
command -v reprepro >/dev/null 2>&1 || { echo >&2 "This script requires aptly but it's not installed. See https://www.aptly.info/ for further information. Aborting."; exit 1; }
mkdir -p $APT_REPO_ROOT
if [ -z ${SWIFT_PACKAGE_PLATFORMS+x} ]; then
- platformsarray=( xenial yakkety jessie sid )
+ platformsarray=( xenial artful jessie stretch sid )
else
platformsarray=( $SWIFT_PACKAGE_PLATFORMS )
fi
# distros
for full_distribution_path in $INCOMING_FOLDER/{debian,ubuntu}/*; do
distro_version=`basename $full_distribution_path`
distro_name=$(basename `dirname $full_distribution_path`)
distro_reprepro_root=${APT_REPO_ROOT}/${distro_name}/${distro_version}