forked from artix/artools
Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
21a5c7e916 | ||
|
|
62810d1d85 | ||
|
|
865bd20674 | ||
|
|
b46b5c626e | ||
|
|
9ac4576666 | ||
|
|
a88f196217 | ||
|
|
c0e8ef4c26 | ||
|
|
02b28e82ef | ||
|
|
fb6d1d4c1b | ||
|
|
9fc3fbd14d | ||
|
|
72f2781cb9 | ||
|
|
9ddd73c8b4 | ||
|
|
3c92d5c87a | ||
|
|
bc8f17cc86 | ||
|
|
1ceb6926e9 |
@@ -83,7 +83,7 @@ show_version_table(){
|
||||
}
|
||||
|
||||
show_artix_table(){
|
||||
msg_table_header "%-20s %-20s %-25s %-30s %-30s" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version"
|
||||
msg_table_header "%-20s %-20s %-25s %-30s %-30s" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version"
|
||||
for tree in packages packages-galaxy;do
|
||||
local git=$(find ${tree_dir_artix}/$tree/ -mindepth 1 -maxdepth 1 -type d)
|
||||
for pkg_path in ${git[@]}; do
|
||||
@@ -126,39 +126,52 @@ show_artix_table(){
|
||||
}
|
||||
|
||||
from_arch(){
|
||||
local pkg="$1" archtree="$2" artixtree="$3" src= dest=
|
||||
src=${tree_dir_arch}/$archtree/$pkg/trunk
|
||||
dest=${tree_dir_artix}/$artixtree/$pkg/trunk
|
||||
local pkg="$1" src= dest=
|
||||
local git_tree_arch=$(find_tree "${tree_dir_arch}" "$pkg")
|
||||
[[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
|
||||
src=${tree_dir_arch}/$git_tree_arch/$pkg/trunk
|
||||
|
||||
local git_tree_artix=$(find_tree "${tree_dir_artix}" "$pkg")
|
||||
dest=${tree_dir_artix}/$git_tree_artix/$pkg/trunk
|
||||
|
||||
cd ${tree_dir_arch}/$git_tree_arch
|
||||
|
||||
source $src/PKGBUILD 2>/dev/null
|
||||
cd ${tree_dir_arch}/$archtree
|
||||
msg "Package: %s" "$pkg"
|
||||
local archver=$(get_full_version $pkg)
|
||||
|
||||
msg "Package: %s" "$pkg"
|
||||
msg2 "Arch Version: %s" "$archver"
|
||||
[[ -n ${makedepends[@]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
|
||||
[[ -n ${checkdepends[@]} ]] && msg2 "depends: %s" "${checkdepends[*]}"
|
||||
[[ -n ${depends[@]} ]] && msg2 "depends: %s" "${depends[*]}"
|
||||
|
||||
if [[ -d $dest ]];then
|
||||
cd ${tree_dir_artix}/$git_tree_artix
|
||||
|
||||
source $dest/PKGBUILD 2>/dev/null
|
||||
cd ${tree_dir_artix}/$artixtree
|
||||
local artixver=$(get_full_version $pkg)
|
||||
|
||||
msg2 "Artix Version: %s" "$artixver"
|
||||
if [ $(vercmp $artixver $archver) -lt 0 ];then
|
||||
info "Importing from archlinux (%s)" "$archtree"
|
||||
rsync "${rsync_args[@]}" $src/ $dest/
|
||||
patch_pkg "$pkg" "$tree"
|
||||
else
|
||||
warning "Versions match! Nothing to do!"
|
||||
fi
|
||||
info "Update from archlinux (%s)" "$git_tree_arch"
|
||||
rsync "${rsync_args[@]}" $src/ $dest/
|
||||
patch_pkg "$pkg" "$tree"
|
||||
else
|
||||
cd ${tree_dir_artix}/$artixtree
|
||||
info "Importing from archlinux (%s)" "$archtree"
|
||||
[[ $git_tree_arch == 'packages' ]] && git_tree_artix=$git_tree_arch
|
||||
[[ $git_tree_arch == 'community' ]] && git_tree_artix='packages-galaxy'
|
||||
|
||||
cd ${tree_dir_artix}/$git_tree_artix
|
||||
|
||||
dest=${tree_dir_artix}/$git_tree_artix/$pkg/trunk
|
||||
mkdir $pkg
|
||||
|
||||
info "Import from archlinux (%s)" "$git_tree_arch"
|
||||
rsync "${rsync_args[@]}" $src/ $dest/
|
||||
patch_pkg "$pkg" "$tree"
|
||||
fi
|
||||
}
|
||||
|
||||
sync_repos(){
|
||||
pull_tree_arch
|
||||
${sync_arch} && pull_tree_arch
|
||||
pull_tree_artix
|
||||
}
|
||||
|
||||
@@ -171,12 +184,12 @@ display_settings(){
|
||||
|
||||
msg "ARGS:"
|
||||
msg2 "sync: %s" "${sync}"
|
||||
msg2 "sync_arch: %s" "${sync_arch}"
|
||||
msg2 "compare: %s" "${compare}"
|
||||
msg2 "upgrades: %s" "${upgrades}"
|
||||
msg2 "downgrades: %s" "${downgrades}"
|
||||
msg2 "artix: %s" "${artix}"
|
||||
msg2 "import_packages: %s" "${import_packages}"
|
||||
msg2 "import_community: %s" "${import_community}"
|
||||
msg2 "import: %s" "${import}"
|
||||
|
||||
msg "PATHS:"
|
||||
msg2 "tree_dir_artix: %s" "${tree_dir_artix}"
|
||||
@@ -191,29 +204,26 @@ load_vars /etc/makepkg.conf
|
||||
|
||||
pretend=false
|
||||
sync=false
|
||||
sync_arch=true
|
||||
compare=false
|
||||
upgrades=true
|
||||
downgrades=false
|
||||
artix=false
|
||||
import_packages=false
|
||||
import_community=false
|
||||
import=false
|
||||
package=''
|
||||
|
||||
git_artix='packages'
|
||||
git_arch='packages'
|
||||
|
||||
rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
|
||||
|
||||
usage() {
|
||||
echo "Usage: ${0##*/} [options]"
|
||||
echo ' -p <pkg> Package name'
|
||||
echo " -s Clone or pull repos"
|
||||
echo " -z Don't clone or pull arch repos"
|
||||
echo ' -c Compare packages'
|
||||
echo ' -u Show upgrade packages'
|
||||
echo ' -d Show downgrade packages'
|
||||
echo ' -a Show artix specific packages'
|
||||
echo ' -i Import from arch packages'
|
||||
echo ' -j Import from arch community'
|
||||
echo ' -i Import a package from arch'
|
||||
echo ' -q Query settings'
|
||||
echo ' -h This help'
|
||||
echo ''
|
||||
@@ -223,18 +233,18 @@ usage() {
|
||||
|
||||
orig_argv=("$0" "$@")
|
||||
|
||||
opts='p:csudaijqh'
|
||||
opts='p:csudaizqh'
|
||||
|
||||
while getopts "${opts}" arg; do
|
||||
case "${arg}" in
|
||||
p) package="$OPTARG" ;;
|
||||
s) sync=true ;;
|
||||
z) sync_arch=false ;;
|
||||
c) compare=true ;;
|
||||
u) upgrades=false ;;
|
||||
d) downgrades=true ;;
|
||||
a) artix=true ;;
|
||||
i) import_packages=true ;;
|
||||
j) import_community=true; git_artix='packages-galaxy'; git_arch='community' ;;
|
||||
i) import=true ;;
|
||||
q) pretend=true ;;
|
||||
h|?) usage 0 ;;
|
||||
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
||||
@@ -254,6 +264,4 @@ ${compare} && show_version_table
|
||||
|
||||
${artix} && show_artix_table
|
||||
|
||||
${import_packages} && from_arch "${package}" "${git_arch}" "${git_artix}"
|
||||
|
||||
${import_community} && from_arch "${package}" "${git_arch}" "${git_artix}"
|
||||
${import} && from_arch "${package}"
|
||||
|
||||
@@ -22,12 +22,7 @@ import ${LIBDIR}/util-pkg.sh
|
||||
commit_pkg(){
|
||||
local git_tree=$(find_tree "${tree_dir_artix}" "${package}")
|
||||
if [[ -n ${git_tree} ]];then
|
||||
cd ${tree_dir_artix}/${git_tree}
|
||||
|
||||
msg "Checking (%s)" "${git_tree}"
|
||||
pull_tree
|
||||
|
||||
cd ${package}
|
||||
cd ${tree_dir_artix}/${git_tree}/${package}
|
||||
|
||||
source trunk/PKGBUILD
|
||||
[[ $arch == 'any' ]] && CARCH=any
|
||||
@@ -44,13 +39,17 @@ commit_pkg(){
|
||||
fi
|
||||
msg "Action: [%s] '%s' %s" "${source_repo}" "$pkg" "${action}"
|
||||
git commit -m "[${source_repo}] '$pkg' ${action}"
|
||||
${push} && push_tree
|
||||
else
|
||||
local action='modify'
|
||||
msg "Action: [%s] '%s' %s" "${source_repo}" "${package}-$ver" "${action}"
|
||||
git add .
|
||||
git commit -m "[${source_repo}] '${package}-$ver' ${action}"
|
||||
${push} && push_tree
|
||||
fi
|
||||
|
||||
if ${push};then
|
||||
msg "Checking (%s)" "${git_tree}"
|
||||
git pull origin master
|
||||
git push origin master
|
||||
fi
|
||||
else
|
||||
error "Package '%s' does not exist!" "${package}"
|
||||
@@ -60,12 +59,7 @@ commit_pkg(){
|
||||
symlink_commit_pkg(){
|
||||
local git_tree=$(find_tree "${tree_dir_artix}" "${package}")
|
||||
if [[ -n ${git_tree} ]];then
|
||||
cd ${tree_dir_artix}/${git_tree}
|
||||
|
||||
msg "Checking (%s)" "${git_tree}"
|
||||
pull_tree
|
||||
|
||||
cd ${package}
|
||||
cd ${tree_dir_artix}/${git_tree}/${package}
|
||||
|
||||
source trunk/PKGBUILD
|
||||
[[ $arch == 'any' ]] && CARCH=any
|
||||
@@ -75,10 +69,9 @@ symlink_commit_pkg(){
|
||||
local action='add'
|
||||
local dest=${target_repo}-$CARCH
|
||||
|
||||
[[ -d repos/$dest ]] && git rm -r repos/$dest
|
||||
[[ ! -d repos ]] && mkdir repos
|
||||
cd repos
|
||||
[[ -d $dest ]] && git rm -r $dest
|
||||
cd ..
|
||||
|
||||
cp -r trunk repos/$dest
|
||||
else
|
||||
local action='move'
|
||||
@@ -93,7 +86,12 @@ symlink_commit_pkg(){
|
||||
msg "Action: [%s] -> [%s] '%s' %s" "${source_repo}" "${target_repo}" "${package}-$ver" "${action}"
|
||||
git add .
|
||||
git commit -m "[${source_repo}] -> [${target_repo}] '${package}-$ver' ${action}"
|
||||
${push} && push_tree
|
||||
|
||||
if ${push};then
|
||||
msg "Checking (%s)" "${git_tree}"
|
||||
git pull origin master
|
||||
git push origin master
|
||||
fi
|
||||
else
|
||||
error "Package '%s' does not exist!" "${package}"
|
||||
fi
|
||||
|
||||
@@ -202,11 +202,15 @@ _chrootbuild() {
|
||||
# No coredumps
|
||||
ulimit -c 0
|
||||
|
||||
exec </dev/console
|
||||
# Work around chroot-run not giving a ctty
|
||||
# exec </dev/console
|
||||
|
||||
. /etc/profile
|
||||
|
||||
export LANG=en_US.UTF-8
|
||||
|
||||
# workaround meson locale errors
|
||||
# supposedly fixed with coming python-3.7
|
||||
locale-gen &> /dev/null
|
||||
|
||||
sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
|
||||
|
||||
@@ -1,274 +0,0 @@
|
||||
def ADD_REPO = ''
|
||||
def RM_REPO = ''
|
||||
def IS_ADD = 'false'
|
||||
def IS_REMOVE = 'false'
|
||||
def IS_BUILD = 'false'
|
||||
def PKG_TRUNK = ''
|
||||
def PKG_PATH = ''
|
||||
|
||||
pipeline {
|
||||
agent any
|
||||
options {
|
||||
skipDefaultCheckout()
|
||||
timestamps()
|
||||
}
|
||||
stages {
|
||||
stage('Checkout') {
|
||||
steps {
|
||||
script {
|
||||
checkout scm
|
||||
|
||||
def currentCommit = sh(returnStdout: true, script: 'git rev-parse @').trim()
|
||||
echo "currentCommit: ${currentCommit}"
|
||||
|
||||
def changedFilesStatus = sh(returnStdout: true, script: "git show --pretty=format: --name-status ${currentCommit}").tokenize('\n')
|
||||
def changedPkgStatus = []
|
||||
def pkgPath = []
|
||||
int entryCount = 0
|
||||
for ( int i = 0; i < changedFilesStatus.size(); i++ ) {
|
||||
def entry = changedFilesStatus[i].split()
|
||||
def fileStatus = entry[0]
|
||||
entryCount = entry.size()
|
||||
for ( int j = 1; j < entry.size(); j++ ) {
|
||||
if ( entry[j].contains('/PKGBUILD') && entry[j].contains('/repos') ){
|
||||
changedPkgStatus << "${fileStatus} " + entry[j].minus('/PKGBUILD')
|
||||
pkgPath << entry[j].minus('/PKGBUILD')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int pkgCount = changedPkgStatus.size()
|
||||
int pkgPathCount = pkgPath.size()
|
||||
echo "pkgCount: ${pkgCount}"
|
||||
echo "entryCount: ${entryCount}"
|
||||
echo "pkgPathCount: ${pkgPathCount}"
|
||||
echo "changedPkgStatus: ${changedPkgStatus}"
|
||||
|
||||
if ( pkgCount > 0 ) {
|
||||
|
||||
if ( entryCount == 2 && pkgCount == 2 ) {
|
||||
def pkgEntry1 = changedPkgStatus[0].split()
|
||||
def pkgEntry2 = changedPkgStatus[1].split()
|
||||
def srcPath = []
|
||||
def pkgStatus = []
|
||||
srcPath << pkgEntry1[1]
|
||||
srcPath << pkgEntry2[1]
|
||||
pkgStatus << pkgEntry1[0]
|
||||
pkgStatus << pkgEntry2[0]
|
||||
def buildInfo1 = srcPath[0].tokenize('/')
|
||||
def buildInfo2 = srcPath[1].tokenize('/')
|
||||
|
||||
if ( pkgStatus[0] == "M" ) {
|
||||
IS_ADD = 'true'
|
||||
if ( srcPath[0].contains('community-testing') ) {
|
||||
ADD_REPO = 'galaxy-gremlins'
|
||||
} else if ( srcPath[0].contains('community-x86_64') || srcPath[0].contains('community-any') ) {
|
||||
ADD_REPO = 'galaxy'
|
||||
}
|
||||
if ( srcPath[0].contains('multilib-testing') ) {
|
||||
ADD_REPO = 'lib32-gremlins'
|
||||
} else if ( srcPath[0].contains('multilib-x86_64') ) {
|
||||
ADD_REPO = 'lib32'
|
||||
}
|
||||
} else if ( pkgStatus[1] == "M" ) {
|
||||
IS_ADD = 'true'
|
||||
if ( srcPath[1].contains('community-testing') ) {
|
||||
ADD_REPO = 'galaxy-gremlins'
|
||||
} else if ( srcPath[1].contains('community-x86_64') || srcPath[1].contains('community-any') ) {
|
||||
ADD_REPO = 'galaxy'
|
||||
}
|
||||
if ( srcPath[1].contains('multilib-testing') ) {
|
||||
ADD_REPO = 'lib32-gremlins'
|
||||
} else if ( srcPath[1].contains('multilib-x86_64') ) {
|
||||
ADD_REPO = 'lib32'
|
||||
}
|
||||
}
|
||||
|
||||
if ( pkgStatus[0] == "D" ) {
|
||||
IS_REMOVE = 'true'
|
||||
if ( srcPath[0].contains('community-testing') ) {
|
||||
RM_REPO = 'galaxy-gremlins'
|
||||
} else if ( srcPath[0].contains('community-x86_64') || srcPath[0].contains('community-any') ) {
|
||||
RM_REPO = 'galaxy'
|
||||
}
|
||||
if ( srcPath[0].contains('multilib-testing') ) {
|
||||
RM_REPO = 'lib32-gremlins'
|
||||
} else if ( srcPath[0].contains('multilib-x86_64') ) {
|
||||
RM_REPO = 'lib32'
|
||||
}
|
||||
} else if ( pkgStatus[1] == "D" ) {
|
||||
IS_REMOVE = 'true'
|
||||
if ( srcPath[1].contains('community-testing') ) {
|
||||
RM_REPO = 'galaxy-gremlins'
|
||||
} else if ( srcPath[1].contains('community-x86_64') || srcPath[1].contains('community-any') ) {
|
||||
RM_REPO = 'galaxy'
|
||||
}
|
||||
if ( srcPath[1].contains('multilib-testing') ) {
|
||||
RM_REPO = 'lib32-gremlins'
|
||||
} else if ( srcPath[1].contains('multilib-x86_64') ) {
|
||||
RM_REPO = 'lib32'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
PKG_TRUNK = buildInfo1[0] + '/trunk'
|
||||
}
|
||||
|
||||
if ( entryCount == 3 && pkgCount == 2 ) {
|
||||
def pkgEntry = changedPkgStatus[0].split()
|
||||
def pkgStatus = pkgEntry[0]
|
||||
def buildInfo1 = pkgPath[0].tokenize('/')
|
||||
def buildInfo2 = pkgPath[1].tokenize('/')
|
||||
|
||||
if ( pkgStatus.contains('R') ) {
|
||||
IS_ADD = 'true'
|
||||
IS_REMOVE = 'true'
|
||||
|
||||
if ( pkgPath[0].contains('community-staging') && pkgPath[1].contains('community-testing') ) {
|
||||
ADD_REPO = 'galaxy-gremlins'
|
||||
RM_REPO = 'galaxy-goblins'
|
||||
} else if ( pkgPath[0].contains('community-testing') && pkgPath[1].contains('community-staging') ) {
|
||||
ADD_REPO = 'galaxy-goblins'
|
||||
RM_REPO = 'galaxy-gremlins'
|
||||
}
|
||||
|
||||
if ( pkgPath[0].contains('community-testing') && pkgPath[1].contains('community-x86_64') || pkgPath[0].contains('community-any') ) {
|
||||
ADD_REPO = 'galaxy-gremlins'
|
||||
RM_REPO = 'galaxy'
|
||||
} else if ( pkgPath[0].contains('community-x86_64') || pkgPath[0].contains('community-any') && pkgPath[1].contains('community-testing') ) {
|
||||
ADD_REPO = 'galaxy'
|
||||
RM_REPO = 'galaxy-gremlins'
|
||||
}
|
||||
|
||||
if ( pkgPath[0].contains('multilib-staging') && pkgPath[1].contains('multilib-testing') ) {
|
||||
ADD_REPO = 'lib32-gremlins'
|
||||
RM_REPO = 'lib32-goblins'
|
||||
} else if ( pkgPath[0].contains('multilib-testing') && pkgPath[1].contains('multilib-staging') ) {
|
||||
ADD_REPO = 'lib32-goblins'
|
||||
RM_REPO = 'lib32-gremlins'
|
||||
}
|
||||
|
||||
if ( pkgPath[0].contains('multilib-testing') && pkgPath[1].contains('multilib-x86_64') ) {
|
||||
ADD_REPO = 'lib32'
|
||||
RM_REPO = 'lib32-gremlins'
|
||||
} else if ( pkgPath[0].contains('multilib-x86_64') && pkgPath[1].contains('multilib-testing') ) {
|
||||
ADD_REPO = 'lib32-gremlins'
|
||||
RM_REPO = 'lib32'
|
||||
}
|
||||
}
|
||||
PKG_TRUNK = buildInfo1[0] + '/trunk'
|
||||
}
|
||||
|
||||
if ( pkgCount == 1 ) {
|
||||
def pkgEntry = changedPkgStatus[0].split()
|
||||
def pkgStatus = pkgEntry[0]
|
||||
def srcPath = pkgEntry[1]
|
||||
def buildInfo = srcPath.tokenize('/')
|
||||
|
||||
if ( srcPath.contains('community-staging') ) {
|
||||
if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
|
||||
IS_BUILD = 'true'
|
||||
}
|
||||
if ( pkgStatus == 'D' ) {
|
||||
IS_REMOVE = 'true'
|
||||
}
|
||||
ADD_REPO = 'galaxy-goblins'
|
||||
RM_REPO = ADD_REPO
|
||||
} else if ( srcPath.contains('community-testing') ) {
|
||||
if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
|
||||
IS_BUILD = 'true'
|
||||
}
|
||||
if ( pkgStatus == 'D' ) {
|
||||
IS_REMOVE = 'true'
|
||||
}
|
||||
ADD_REPO = 'galaxy-gremlins'
|
||||
RM_REPO = ADD_REPO
|
||||
} else if ( srcPath.contains('community-x86_64') || srcPath.contains('community-any') ) {
|
||||
if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
|
||||
IS_BUILD = 'true'
|
||||
}
|
||||
if ( pkgStatus == 'D' ) {
|
||||
IS_REMOVE = 'true'
|
||||
}
|
||||
ADD_REPO = 'galaxy'
|
||||
RM_REPO = ADD_REPO
|
||||
}
|
||||
if ( srcPath.contains('multilib-staging') ) {
|
||||
if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
|
||||
IS_BUILD = 'true'
|
||||
}
|
||||
if ( pkgStatus == 'D' ) {
|
||||
IS_REMOVE = 'true'
|
||||
}
|
||||
ADD_REPO = 'lib32-goblins'
|
||||
RM_REPO = ADD_REPO
|
||||
} else if ( srcPath.contains('multilib-testing') ) {
|
||||
if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
|
||||
IS_BUILD = 'true'
|
||||
}
|
||||
if ( pkgStatus == 'D' ) {
|
||||
IS_REMOVE = 'true'
|
||||
}
|
||||
ADD_REPO = 'lib32-gremlins'
|
||||
RM_REPO = ADD_REPO
|
||||
} else if ( srcPath.contains('multilib-x86_64') ) {
|
||||
if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
|
||||
IS_BUILD = 'true'
|
||||
}
|
||||
if ( pkgStatus == 'D' ) {
|
||||
IS_REMOVE = 'true'
|
||||
}
|
||||
ADD_REPO = 'lib32'
|
||||
RM_REPO = ADD_REPO
|
||||
}
|
||||
PKG_PATH = srcPath
|
||||
PKG_TRUNK = buildInfo[0] + '/trunk'
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Build') {
|
||||
environment {
|
||||
BUILDBOT_GPGP = credentials('BUILDBOT_GPGP')
|
||||
}
|
||||
when {
|
||||
expression { return IS_BUILD == 'true' }
|
||||
}
|
||||
steps {
|
||||
dir("${PKG_PATH}") {
|
||||
sh "buildpkg -r ${ADD_REPO}"
|
||||
}
|
||||
}
|
||||
post {
|
||||
success {
|
||||
dir("${PKG_PATH}") {
|
||||
sh "deploypkg -a -d ${ADD_REPO} -s"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Add') {
|
||||
when {
|
||||
expression { return IS_ADD == 'true' }
|
||||
}
|
||||
steps {
|
||||
dir("${PKG_TRUNK}") {
|
||||
sh "deploypkg -a -d ${ADD_REPO}"
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Remove') {
|
||||
when {
|
||||
expression { return IS_REMOVE == 'true' }
|
||||
}
|
||||
steps {
|
||||
dir("${PKG_TRUNK}") {
|
||||
sh "deploypkg -r -d ${RM_REPO}"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,241 +0,0 @@
|
||||
def ADD_REPO = ''
|
||||
def RM_REPO = ''
|
||||
def IS_ADD = 'false'
|
||||
def IS_REMOVE = 'false'
|
||||
def IS_BUILD = 'false'
|
||||
def PKG_TRUNK = ''
|
||||
def PKG_PATH = ''
|
||||
|
||||
pipeline {
|
||||
agent any
|
||||
options {
|
||||
skipDefaultCheckout()
|
||||
timestamps()
|
||||
}
|
||||
stages {
|
||||
stage('Checkout') {
|
||||
steps {
|
||||
script {
|
||||
checkout scm
|
||||
|
||||
def currentCommit = sh(returnStdout: true, script: 'git rev-parse @').trim()
|
||||
echo "currentCommit: ${currentCommit}"
|
||||
|
||||
def changedFilesStatus = sh(returnStdout: true, script: "git show --pretty=format: --name-status ${currentCommit}").tokenize('\n')
|
||||
def changedPkgStatus = []
|
||||
def pkgPath = []
|
||||
int entryCount = 0
|
||||
for ( int i = 0; i < changedFilesStatus.size(); i++ ) {
|
||||
def entry = changedFilesStatus[i].split()
|
||||
def fileStatus = entry[0]
|
||||
entryCount = entry.size()
|
||||
for ( int j = 1; j < entry.size(); j++ ) {
|
||||
if ( entry[j].contains('/PKGBUILD') && entry[j].contains('/repos') ){
|
||||
changedPkgStatus << "${fileStatus} " + entry[j].minus('/PKGBUILD')
|
||||
pkgPath << entry[j].minus('/PKGBUILD')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int pkgCount = changedPkgStatus.size()
|
||||
int pkgPathCount = pkgPath.size()
|
||||
echo "pkgCount: ${pkgCount}"
|
||||
echo "entryCount: ${entryCount}"
|
||||
echo "pkgPathCount: ${pkgPathCount}"
|
||||
echo "changedPkgStatus: ${changedPkgStatus}"
|
||||
|
||||
if ( pkgCount > 0 ) {
|
||||
|
||||
if ( entryCount == 2 && pkgCount == 2 ) {
|
||||
def pkgEntry1 = changedPkgStatus[0].split()
|
||||
def pkgEntry2 = changedPkgStatus[1].split()
|
||||
def srcPath = []
|
||||
def pkgStatus = []
|
||||
srcPath << pkgEntry1[1]
|
||||
srcPath << pkgEntry2[1]
|
||||
pkgStatus << pkgEntry1[0]
|
||||
pkgStatus << pkgEntry2[0]
|
||||
def buildInfo1 = srcPath[0].tokenize('/')
|
||||
def buildInfo2 = srcPath[1].tokenize('/')
|
||||
|
||||
if ( pkgStatus[0] == 'M' ) {
|
||||
IS_ADD = 'true'
|
||||
if ( srcPath[0].contains('testing') ) {
|
||||
ADD_REPO = 'gremlins'
|
||||
} else if ( srcPath[0].contains('core') ) {
|
||||
ADD_REPO = 'system'
|
||||
} else if ( srcPath[0].contains('extra') ) {
|
||||
ADD_REPO = 'world'
|
||||
}
|
||||
} else if ( pkgStatus[1] == 'M' ) {
|
||||
IS_ADD = 'true'
|
||||
if ( srcPath[1].contains('testing') ) {
|
||||
ADD_REPO = 'gremlins'
|
||||
} else if ( srcPath[1].contains('core') ) {
|
||||
ADD_REPO = ''
|
||||
} else if ( srcPath[1].contains('extra') ) {
|
||||
ADD_REPO = 'world'
|
||||
}
|
||||
}
|
||||
|
||||
if ( pkgStatus[0] == 'D' ) {
|
||||
IS_REMOVE = 'true'
|
||||
if ( srcPath[0].contains('testing') ) {
|
||||
RM_REPO = 'gremlins'
|
||||
} else if ( srcPath[0].contains('core') ) {
|
||||
RM_REPO = 'system'
|
||||
} else if ( srcPath[0].contains('extra') ) {
|
||||
RM_REPO = 'world'
|
||||
}
|
||||
} else if ( pkgStatus[1] == 'D' ) {
|
||||
IS_REMOVE = 'true'
|
||||
if ( srcPath[1].contains('testing') ) {
|
||||
RM_REPO = 'gremlins'
|
||||
} else if ( srcPath[1].contains('core') ) {
|
||||
RM_REPO = 'system'
|
||||
} else if ( srcPath[1].contains('extra') ) {
|
||||
RM_REPO = 'world'
|
||||
}
|
||||
}
|
||||
|
||||
PKG_TRUNK = buildInfo1[0] + '/trunk'
|
||||
}
|
||||
|
||||
if ( entryCount == 3 && pkgCount == 2 ) {
|
||||
def pkgEntry = changedPkgStatus[0].split()
|
||||
def pkgStatus = pkgEntry[0]
|
||||
def buildInfo1 = pkgPath[0].tokenize('/')
|
||||
def buildInfo2 = pkgPath[1].tokenize('/')
|
||||
|
||||
if ( pkgStatus.contains('R') ) {
|
||||
IS_ADD = 'true'
|
||||
IS_REMOVE = 'true'
|
||||
|
||||
if ( pkgPath[0].contains('staging') && pkgPath[1].contains('testing') ) {
|
||||
ADD_REPO = 'gremlins'
|
||||
RM_REPO = 'goblins'
|
||||
} else if ( pkgPath[0].contains('testing') && pkgPath[1].contains('staging') ) {
|
||||
ADD_REPO = 'goblins'
|
||||
RM_REPO = 'gremlins'
|
||||
}
|
||||
|
||||
if ( pkgPath[0].contains('core') && pkgPath[1].contains('testing')) {
|
||||
ADD_REPO = 'gremlins'
|
||||
RM_REPO = 'system'
|
||||
} else if ( pkgPath[0].contains('testing') && pkgPath[1].contains('core')) {
|
||||
ADD_REPO = 'system'
|
||||
RM_REPO = 'gremlins'
|
||||
}
|
||||
|
||||
if ( pkgPath[0].contains('extra') && pkgPath[1].contains('testing')) {
|
||||
ADD_REPO = 'gremlins'
|
||||
RM_REPO = 'world'
|
||||
} else if ( pkgPath[0].contains('testing') && pkgPath[1].contains('extra')) {
|
||||
ADD_REPO = 'world'
|
||||
RM_REPO = 'gremlins'
|
||||
}
|
||||
|
||||
if ( pkgPath[0].contains('core') && pkgPath[1].contains('extra')) {
|
||||
ADD_REPO = 'world'
|
||||
RM_REPO = 'system'
|
||||
} else if ( pkgPath[0].contains('extra') && pkgPath[1].contains('core')) {
|
||||
ADD_REPO = 'system'
|
||||
RM_REPO = 'world'
|
||||
}
|
||||
}
|
||||
PKG_TRUNK = buildInfo1[0] + '/trunk'
|
||||
}
|
||||
|
||||
if ( pkgCount == 1 ) {
|
||||
def pkgEntry = changedPkgStatus[0].split()
|
||||
def pkgStatus = pkgEntry[0]
|
||||
def srcPath = pkgEntry[1]
|
||||
def buildInfo = srcPath.tokenize('/')
|
||||
|
||||
if ( srcPath.contains('staging') ) {
|
||||
if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
|
||||
IS_BUILD = 'true'
|
||||
}
|
||||
if ( pkgStatus == 'D' ) {
|
||||
IS_REMOVE = 'true'
|
||||
}
|
||||
ADD_REPO = 'goblins'
|
||||
RM_REPO = ADD_REPO
|
||||
} else if ( srcPath.contains('testing') ) {
|
||||
if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
|
||||
IS_BUILD = 'true'
|
||||
}
|
||||
if ( pkgStatus == 'D' ) {
|
||||
IS_REMOVE = 'true'
|
||||
}
|
||||
ADD_REPO = 'gremlins'
|
||||
RM_REPO = ADD_REPO
|
||||
} else if ( srcPath.contains('core') ) {
|
||||
if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
|
||||
IS_BUILD = 'true'
|
||||
}
|
||||
if ( pkgStatus == 'D' ) {
|
||||
IS_REMOVE = 'true'
|
||||
}
|
||||
ADD_REPO = 'system'
|
||||
RM_REPO = ADD_REPO
|
||||
} else if ( srcPath.contains('extra') ) {
|
||||
if ( pkgStatus == 'A' || pkgStatus == 'M' ) {
|
||||
IS_BUILD = 'true'
|
||||
}
|
||||
if ( pkgStatus == 'D' ) {
|
||||
IS_REMOVE = 'true'
|
||||
}
|
||||
ADD_REPO = 'world'
|
||||
RM_REPO = ADD_REPO
|
||||
}
|
||||
PKG_PATH = srcPath
|
||||
PKG_TRUNK = buildInfo[0] + '/trunk'
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Build') {
|
||||
environment {
|
||||
BUILDBOT_GPGP = credentials('BUILDBOT_GPGP')
|
||||
}
|
||||
when {
|
||||
expression { return IS_BUILD == 'true' }
|
||||
}
|
||||
steps {
|
||||
dir("${PKG_PATH}") {
|
||||
sh "buildpkg -r ${ADD_REPO}"
|
||||
}
|
||||
}
|
||||
post {
|
||||
success {
|
||||
dir("${PKG_PATH}") {
|
||||
sh "deploypkg -a -d ${ADD_REPO} -s"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Add') {
|
||||
when {
|
||||
expression { return IS_ADD == 'true' }
|
||||
}
|
||||
steps {
|
||||
dir("${PKG_TRUNK}") {
|
||||
sh "deploypkg -a -d ${ADD_REPO}"
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Remove') {
|
||||
when {
|
||||
expression { return IS_REMOVE == 'true' }
|
||||
}
|
||||
steps {
|
||||
dir("${PKG_TRUNK}") {
|
||||
sh "deploypkg -r -d ${RM_REPO}"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -33,7 +33,7 @@
|
||||
# initsys="openrc"
|
||||
|
||||
# unset defaults to given value
|
||||
# kernel="linux-lts"
|
||||
# kernel="linux"
|
||||
|
||||
# custom additional kernel args
|
||||
# kernel_args=""
|
||||
|
||||
25
data/missing
25
data/missing
@@ -1,25 +0,0 @@
|
||||
extra/speexdsp
|
||||
extra/spandsp
|
||||
extra/soundtouch
|
||||
extra/sbc
|
||||
extra/neon
|
||||
extra/mjpegtools
|
||||
extra/libmp4v2
|
||||
extra/js
|
||||
extra/gst-plugins-bad
|
||||
extra/faac
|
||||
extra/enchant
|
||||
extra/chromaprint
|
||||
extra/python-appdirs
|
||||
extra/python-beaker
|
||||
extra/python-mako
|
||||
extra/python-markupsafe
|
||||
extra/python-packaging
|
||||
extra/python-pyparsing
|
||||
extra/ttf-liberation
|
||||
extra/appstream-glib
|
||||
extra/libxkbui
|
||||
extra/libxkbfile
|
||||
extra/libunicodenames
|
||||
extra/mpg123
|
||||
extra/opencl-headers
|
||||
@@ -1,38 +0,0 @@
|
||||
qt5-base
|
||||
qt5-xmlpatterns
|
||||
qt5-x11extras
|
||||
qt5-script
|
||||
qt5-svg
|
||||
qt5-serialport
|
||||
qt5-serialbus
|
||||
qt5-networkauth
|
||||
qt5-imageformats
|
||||
qt5-declarative
|
||||
qt5-wayland
|
||||
qt5-sensors
|
||||
qt5-scxml
|
||||
qt5-connectivity
|
||||
qt5-graphicaleffects
|
||||
qt5-gamepad
|
||||
qt5-3d
|
||||
qt5-canvas3d
|
||||
qt5-datavis3d
|
||||
qt5-charts
|
||||
qt5-virtualkeyboard
|
||||
qt5-location
|
||||
qt5-multimedia
|
||||
qt5-speech
|
||||
qt5-quickcontrols
|
||||
qt5-quickcontrols2
|
||||
qt5-remoteobjects
|
||||
qt5-webchannel
|
||||
qt5-websockets
|
||||
qt5-webglplugin
|
||||
qt5-tools
|
||||
qt5-translations
|
||||
qt5-doc
|
||||
qt5-examples
|
||||
qt5-webengine
|
||||
qt5-webview
|
||||
qt5-webkit
|
||||
pyqt5
|
||||
@@ -95,7 +95,7 @@ init_artools_iso(){
|
||||
|
||||
[[ -z ${initsys} ]] && initsys="openrc"
|
||||
|
||||
[[ -z ${kernel} ]] && kernel="linux-lts"
|
||||
[[ -z ${kernel} ]] && kernel="linux"
|
||||
|
||||
[[ -z ${kernel_args} ]] && kernel_args=""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user