YunoHost/vinaigrette
1
0
Fork 0
mirror of https://github.com/YunoHost/vinaigrette.git synced 2024-09-03 20:06:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

s/stretch/buster/

Browse source
This commit is contained in:
Arthur Lutz 2019-12-03 17:05:19 +01:00
parent ecb925525e
commit 9e6b790ffc
14 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -72,7 +72,7 @@ Interesting note from [this page](http://tldp.org/HOWTO/html_single/Debian-Binar
- Copy the 'shell after error' hook : `cp /usr/share/doc/pbuilder/examples/C10shell /home/vinaigrette/scripts/pbuilder/hooks/` - Copy the 'shell after error' hook : `cp /usr/share/doc/pbuilder/examples/C10shell /home/vinaigrette/scripts/pbuilder/hooks/`
- cd /var/cache/rebuildd/build/ - cd /var/cache/rebuildd/build/
- /home/vinaigrette/scripts/rebuildd/build-binaries stretch rspamd 1.6.4 armhf - /home/vinaigrette/scripts/rebuildd/build-binaries buster rspamd 1.6.4 armhf
#### Removing "conflicting" sources #### Removing "conflicting" sources
@ -84,7 +84,7 @@ Interesting note from [this page](http://tldp.org/HOWTO/html_single/Debian-Binar
reprepro removesrc <codename> <source-package-names> [<source-version>] reprepro removesrc <codename> <source-package-names> [<source-version>]
# For instance # For instance
reprepro removesrc stretch yunohost-admin 3.0.0+201804281857 reprepro removesrc buster yunohost-admin 3.0.0+201804281857
``` ```
### What do I do if a job crashed for some weird reason ? ### What do I do if a job crashed for some weird reason ?

4
config/config
View file

@ -10,11 +10,11 @@ REPO_URL="forge.yunohost.org"
# Codenames, components and architectures # Codenames, components and architectures
AVAILABLE_CODENAMES="stretch" AVAILABLE_CODENAMES="buster"
AVAILABLE_COMPONENTS="stable testing unstable extra" AVAILABLE_COMPONENTS="stable testing unstable extra"
AVAILABLE_ARCH="amd64 i386 armel armhf arm64" AVAILABLE_ARCH="amd64 i386 armel armhf arm64"
DEFAULT_CODENAME="stretch" DEFAULT_CODENAME="buster"
DEFAULT_COMPONENT="unstable" DEFAULT_COMPONENT="unstable"
DEFAULT_ARCH="amd64" DEFAULT_ARCH="amd64"

8
config/distributions
View file

@ -1,12 +1,12 @@
Origin: YunoHost Origin: YunoHost
Label: YunoHost for Stretch Label: YunoHost for Buster
Suite: stable Suite: stable
Codename: stretch Codename: buster
Version: 9.0 Version: 9.0
Architectures: i386 amd64 armel armhf arm64 source Architectures: i386 amd64 armel armhf arm64 source
Components: stable testing unstable extra Components: stable testing unstable extra
AlsoAcceptFor: stretch-stable stretch-testing stretch-unstable stable testing unstable AlsoAcceptFor: buster-stable buster-testing buster-unstable stable testing unstable
Description: YunoHost repository for Debian Stretch Description: YunoHost repository for Debian Buster
SignWith: 59A3E6FF SignWith: 59A3E6FF
Tracking: all includechanges keepsources Tracking: all includechanges keepsources
Log: logfile Log: logfile

2
config/pbuilder/pbuilder.conf
View file

@ -6,7 +6,7 @@
# read pbuilderrc.5 document for notes on specific options. # read pbuilderrc.5 document for notes on specific options.
# default distribution # default distribution
DISTRIBUTION="stretch" DISTRIBUTION="buster"
# default location for the user hooks directory # default location for the user hooks directory
HOOKDIR="/home/vinaigrette/scripts/pbuilder/hooks/" HOOKDIR="/home/vinaigrette/scripts/pbuilder/hooks/"

2
config/rebuildd.conf
View file

@ -6,7 +6,7 @@ kill_timeout = 90
source_cmd = /home/vinaigrette/scripts/rebuildd/get-sources ${d} ${p} ${v} source_cmd = /home/vinaigrette/scripts/rebuildd/get-sources ${d} ${p} ${v}
build_cmd = /home/vinaigrette/scripts/rebuildd/build-binaries ${d} ${p} ${v} ${a} build_cmd = /home/vinaigrette/scripts/rebuildd/build-binaries ${d} ${p} ${v} ${a}
post_build_cmd = /home/vinaigrette/scripts/rebuildd/upload-binaries ${d} ${p} ${v} ${a} ${j} post_build_cmd = /home/vinaigrette/scripts/rebuildd/upload-binaries ${d} ${p} ${v} ${a} ${j}
dists = stretch dists = buster
work_dir = /var/cache/rebuildd/build work_dir = /var/cache/rebuildd/build
database_uri = sqlite:///var/lib/rebuildd/rebuildd.db database_uri = sqlite:///var/lib/rebuildd/rebuildd.db
build_more_recent = 1 build_more_recent = 1

2
config/rebuildd.default
View file

@ -4,5 +4,5 @@ PBUILDER_BIN=/usr/sbin/pbuilder
PBUILDER_CACHE_PATH="/var/cache/pbuilder" PBUILDER_CACHE_PATH="/var/cache/pbuilder"
PBUILDER_MIRROR=https://ftp.debian.org/debian PBUILDER_MIRROR=https://ftp.debian.org/debian
ARCHS="amd64 i386 armel armhf arm64" ARCHS="amd64 i386 armel armhf arm64"
DISTS="stretch" DISTS="buster"
ENABLE_BUILDER_MAINT=1 ENABLE_BUILDER_MAINT=1

2
config/sources.list
View file

@ -1 +1 @@
deb-src http://__REPO_URL__/debian stretch stable testing unstable extra deb-src http://__REPO_URL__/debian buster stable testing unstable extra

4
daily-build
View file

@ -2,7 +2,7 @@
readonly THISSCRIPT=$0 readonly THISSCRIPT=$0
readonly BRANCH_NIGHTLY="unstable" readonly BRANCH_NIGHTLY="unstable"
readonly DISTRIB="stretch" readonly DISTRIB="buster"
readonly TIMETAG="$(date +%Y%m%d%H%M)" readonly TIMETAG="$(date +%Y%m%d%H%M)"
readonly PACKAGES="moulinette SSOwat yunohost yunohost-admin" readonly PACKAGES="moulinette SSOwat yunohost yunohost-admin"
readonly FORCE="false" readonly FORCE="false"
@ -40,7 +40,7 @@ function build_if_needed()
git fetch origin git fetch origin
# Check if there's a branch named distrib-branch (e.g. stretch-unstable) # Check if there's a branch named distrib-branch (e.g. buster-unstable)
# By default, keep just 'branch' # By default, keep just 'branch'
BRANCH_NIGHTLY_GIT="$BRANCH_NIGHTLY" BRANCH_NIGHTLY_GIT="$BRANCH_NIGHTLY"
if git branch --list | tr '*' ' ' | awk '{print $1}' | grep -q "^$DISTRIB-$BRANCH_NIGHTLY$" if git branch --list | tr '*' ' ' | awk '{print $1}' | grep -q "^$DISTRIB-$BRANCH_NIGHTLY$"

2
images/make-images
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
readonly DISTRIB=stretch readonly DISTRIB=buster
readonly INIT_DIR=$PWD readonly INIT_DIR=$PWD
readonly ARCHS="amd64 i386 armhf armel arm64" readonly ARCHS="amd64 i386 armhf armel arm64"

4
init.sh
View file

@ -29,7 +29,7 @@ git clone https://github.com/YunoHost/rspamd
git clone https://git.donarmstrong.com/unscd.git git clone https://git.donarmstrong.com/unscd.git
cd yunohost cd yunohost
git checkout stretch && git symbolic-ref refs/heads/stretch-unstable refs/heads/stretch git checkout buster && git symbolic-ref refs/heads/buster-unstable refs/heads/buster
cd .. cd ..
mkdir -p /var/www/repo/debian/conf/ mkdir -p /var/www/repo/debian/conf/
@ -53,7 +53,7 @@ cat $VINAIGRETTE_HOME/config/sources.list > /etc/apt/sources.list.d/vinaigrette.
sed -i "s/__REPO_URL__/$REPO_URL/g" /etc/nginx/sites-enabled/repo.conf sed -i "s/__REPO_URL__/$REPO_URL/g" /etc/nginx/sites-enabled/repo.conf
sed -i "s/__REPO_URL__/$REPO_URL/g" /etc/apt/sources.list.d/vinaigrette.list sed -i "s/__REPO_URL__/$REPO_URL/g" /etc/apt/sources.list.d/vinaigrette.list
echo "deb https://deb.nodesource.com/node_4.x stretch main" >> /etc/apt/sources.list echo "deb https://deb.nodesource.com/node_4.x buster main" >> /etc/apt/sources.list
echo "127.0.0.1 $REPO_URL" >> /etc/hosts echo "127.0.0.1 $REPO_URL" >> /etc/hosts
service nginx reload service nginx reload

4
scripts/build_deb
View file

@ -26,7 +26,7 @@ Usage:
$THISSCRIPT <distrib> <branch> <folder> $THISSCRIPT <distrib> <branch> <folder>
Arguments: Arguments:
<distrib> stretch (can only build for stretch, no jessie) <distrib> buster (can only build for buster and stretch, no jessie)
<branch> stable, testing, or unstable <branch> stable, testing, or unstable
<folder> the folder in which to build... <folder> the folder in which to build...
EOF EOF
@ -50,7 +50,7 @@ function main()
function validate_arguments() function validate_arguments()
{ {
[[ $DISTRIB =~ ^stretch$ ]] || critical "Invalid distribution $DISTRIB" [[ $DISTRIB =~ ^buster|stretch$ ]] || critical "Invalid distribution $DISTRIB"
[[ $BRANCH =~ ^testing|stable|unstable$ ]] || critical "Invalid branch $BRANCH" [[ $BRANCH =~ ^testing|stable|unstable$ ]] || critical "Invalid branch $BRANCH"
[[ ! -z "$FOLDER" ]] || critical "Need a folder in which to build" [[ ! -z "$FOLDER" ]] || critical "Need a folder in which to build"
} }

2
scripts/package_helpers.sh
View file

@ -32,7 +32,7 @@ extract_codename_distribution()
for p in `echo "$1" | tr "-" "\n"`; do for p in `echo "$1" | tr "-" "\n"`; do
case $i in case $i in
0) 0)
if [[ $p =~ ^stretch$ ]]; then if [[ $p =~ ^buster$ ]]; then
CODENAME=$p CODENAME=$p
else else
echo "invalid Debian codename $p" echo "invalid Debian codename $p"

2
scripts/ynh-custom-builds
View file

@ -3,7 +3,7 @@
readonly THISSCRIPT=$0 readonly THISSCRIPT=$0
readonly PACKAGE=$1 readonly PACKAGE=$1
readonly BRANCH=$2 readonly BRANCH=$2
readonly DISTRIB="stretch" readonly DISTRIB="buster"
source /home/vinaigrette/config/config source /home/vinaigrette/config/config
source /home/vinaigrette/scripts/common.sh source /home/vinaigrette/scripts/common.sh

4
ynh-build
View file

@ -3,7 +3,7 @@
readonly THISSCRIPT=$0 readonly THISSCRIPT=$0
readonly PROJECT=$1 readonly PROJECT=$1
readonly BRANCH=$2 readonly BRANCH=$2
readonly DISTRIB="stretch" readonly DISTRIB="buster"
readonly VERSION=$3 readonly VERSION=$3
readonly TAG=$(echo "debian/$VERSION" | tr '~' '-') readonly TAG=$(echo "debian/$VERSION" | tr '~' '-')
@ -37,7 +37,7 @@ function validate_arguments()
{ {
[[ $PROJECT =~ ^yunohost|yunohost-admin|moulinette|SSOwat$ ]] || critical "Invalid project $PROJECT" [[ $PROJECT =~ ^yunohost|yunohost-admin|moulinette|SSOwat$ ]] || critical "Invalid project $PROJECT"
[[ $BRANCH =~ ^testing|stable|unstable$ ]] || critical "Invalid branch $BRANCH" [[ $BRANCH =~ ^testing|stable|unstable$ ]] || critical "Invalid branch $BRANCH"
[[ $DISTRIB =~ ^stretch$ ]] || critical "Invalid distribution $DISTRIB" [[ $DISTRIB =~ ^buster|stretch$ ]] || critical "Invalid distribution $DISTRIB"
[[ ! -z "$VERSION" ]] || critical "Invalid version $VERSION" [[ ! -z "$VERSION" ]] || critical "Invalid version $VERSION"
[[ "$(tty)" != "not a tty" ]] || critical "You aint in a tty (are you in a 'lxc exec' ?) The script can't run because pbuilder won't be happy :|" [[ "$(tty)" != "not a tty" ]] || critical "You aint in a tty (are you in a 'lxc exec' ?) The script can't run because pbuilder won't be happy :|"
} }