update to new format

.gitlab-ci.yml

 stages:
     - build
-    - commit
     - deploy
+    - request
+
+before_script:
+  - cp ./pacman.conf /etc/pacman.conf.builder
 
 package:
   stage: build
   script:
-    - mkdir -p /etc/pkg
-    - cp ./pkg.cfg /etc/pkg/pkg.cfg
-    - cp ./pacman.conf.builder /etc/pacman.conf.builder
     - pkg-prepare.sh
-    - pkg-build.sh --chdir=trunk $CI_PROJECT_DIR
-
+    - pkg-build.sh
   artifacts:
-    name: $CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA
+    name: $CI_PROJECT_NAME-$CI_COMMIT_SHORT_SHA
     paths:
      - "*.pkg.tar.xz"
-
-  only:
-    changes:
-      - trunk/PKGBUILD
-
-commit:
-  stage: commit
   only:
-    changes:
-      - trunk/PKGBUILD
-
-  script:
-    - pkg-commit.sh
+  - tags
 
 deploy:
   stage: deploy
@@ -36,7 +24,12 @@ deploy:
     - package
   script:
     - pkg-deploy.sh
+  only:
+  - tags
 
+request:
+  stage: build
+  script:
+    - pkg-build.sh
   only:
-    changes:
-      - trunk/PKGBUILD
+  - merge_requests

pacman.conf

+[options]
+HoldPkg = pacman glibc
+Architecture = x86_64
+IgnorePkg = systemd systemd-libs
+CheckSpace
+ParallelDownloads = 5
+SigLevel = Required
+LocalFileSigLevel = Optional
+
+[obcore]
+Server = https://cloud.server.obarun.org/$repo/os/$arch/
+
+[obextra]
+Server = https://cloud.server.obarun.org/$repo/os/$arch/
+
+[observice]
+Server = https://cloud.server.obarun.org/$repo/os/$arch/
+
+[core]
+SigLevel = DatabaseOptional
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+SigLevel = DatabaseOptional
+Include = /etc/pacman.d/mirrorlist

pacman.conf.builder

-#
-# pacman.conf used if the options --pacman-conf passed at our-build.sh on the .gitlab.yml file
-#
-
-[options]
-HoldPkg     = pacman glibc
-Architecture = auto
-IgnorePkg   = systemd
-IgnorePkg   = systemd-libs
-NoExtract   = usr/lib/libsystemd*.*
-Color
-CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-#XferCommand =
-
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-
-#[obcore-testing]
-#SigLevel = Required
-#Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-[obcore]
-SigLevel = Required
-Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-#[obextra-testing]
-#SigLevel = Required
-#Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-[obextra]
-SigLevel = Required
-Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-#[obcommunity-testing]
-#SigLevel = Required
-#Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-[obcommunity]
-SigLevel = Required
-Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-#[obmultilib-testing]
-#SigLevel = Required
-#Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-[obmultilib]
-SigLevel = Required
-Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-#[observice-testing]
-#SigLevel = Required
-#Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-[observice]
-SigLevel = Required
-Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist

pkg.cfg

-# Options passed to makepkg
-makepkg_opts=( "--noconfirm" "--nosign" "--syncdeps" "--rmdeps" "--clean" "--cleanbuild" )

version/0.1.1-1/LICENSE

-Copyright (c) 2018-2019 Eric Vidal <eric@obarun.org>
-All rights reserved.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

version/0.1.1-1/PKGBUILD

-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : https://framagit.org/obarun-pkgbuild-66service/wpa_supplicant-66serv
-#--------------------------------------------------------------------------------------
-
-pkgname=wpa_supplicant-66serv
-pkgver=0.1.1
-pkgrel=1
-pkgdesc="wpa_supplicant services for 66 tools"
-arch=('x86_64')
-url="https://framagit.org/pkg/observice/${pkgname}.git"
-license=('ISC')
-
-track=branch
-target=master
-source=("${pkgname}::git+${url}#${track}=${target}")
-
-depends=(
-    '66'
-    'wpa_supplicant')
-
-makedepends=(
-    'git')
-
-#--------------------------------------------------------------------------------------
-package() {
-    cd "${pkgname}/trunk"
-
-    install -Dm 0644 wpa_supplicant "${pkgdir}"/usr/lib/66/service/wpa_supplicant
-    install -Dm 0644 wpa_supplicant@ "${pkgdir}"/usr/lib/66/service/wpa_supplicant@
-    install -Dm 0644 wpa_supplicant-nl80211@ "${pkgdir}"/usr/lib/66/service/wpa_supplicant-nl80211@
-    install -Dm 0644 wpa_supplicant-wired@ "${pkgdir}"/usr/lib/66/service/wpa_supplicant-wired@
-    install -Dm 0644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE
-}
-
-#--------------------------------------------------------------------------------------
-sha512sums=('SKIP')

version/0.1.1-1/wpa_supplicant

-[main]
-@type = classic
-@name = wpa_supplicant
-@description = "wpa_supplicant daemon"
-@user = ( root )
-@options = ( log env )
-
-[start]
-@build = auto
-@execute = ( execl-cmdline -s { wpa_supplicant ${cmd_args} } )
-
-[environment]
-cmd_args=!-udW

version/0.1.1-1/wpa_supplicant-nl80211@

-[main]
-@type = classic
-@name = wpa_supplicant-nl80211-@I
-@description = "wpa_supplicant-nl80211-@I daemon"
-@user = ( root )
-@options = ( log env )
-
-[start]
-@build = auto
-@execute = ( execl-cmdline -s { wpa_supplicant ${cmd_args} } )
-
-[environment]
-cmd_args=!-c/etc/wpa_supplicant/wpa_supplicant-nl80211-@I.conf -Dnl80211 -i@I 

version/0.1.1-1/wpa_supplicant-wired@

-[main]
-@type = classic
-@name = wpa_supplicant-wired-@I
-@description = "wpa_supplicant-wired-@I daemon"
-@user = ( root )
-@options = ( log env )
-
-[start]
-@build = auto
-@execute = ( execl-cmdline -s { wpa_supplicant ${cmd_args} } )
-
-[environment]
-cmd_args=!-c/etc/wpa_supplicant/wpa_supplicant-wired-@I.conf -Dwired -i@I 

version/0.1.1-1/wpa_supplicant@

-[main]
-@type = classic
-@name = wpa_supplicant-@I
-@description = "wpa_supplicant-@I daemon"
-@user = ( root )
-@options = ( log env )
-
-[start]
-@build = auto
-@execute = ( execl-cmdline -s { wpa_supplicant ${cmd_args} } )
-
-[environment]
-cmd_args=!-c/etc/wpa_supplicant/wpa_supplicant-@I.conf -i@I 

version/0.1.2-1/LICENSE

-Copyright (c) 2018-2019 Eric Vidal <eric@obarun.org>
-All rights reserved.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

version/0.1.2-1/PKGBUILD

-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : https://framagit.org/observice/wpa_supplicant-66serv
-#--------------------------------------------------------------------------------------
-
-pkgname=wpa_supplicant-66serv
-pkgver=0.1.2
-pkgrel=1
-pkgdesc="wpa_supplicant services for 66 tools"
-arch=('x86_64')
-url="https://framagit.org/pkg/observice/${pkgname}.git"
-license=('ISC')
-
-track=branch
-target=testing
-source=("${pkgname}::git+${url}#${track}=${target}")
-
-depends=(
-    '66'
-    'wpa_supplicant')
-
-makedepends=(
-    'git')
-
-#--------------------------------------------------------------------------------------
-package() {
-    cd "${pkgname}/trunk"
-
-    install -Dm 0644 wpa_supplicant "${pkgdir}"/usr/lib/66/service/wpa_supplicant
-    install -Dm 0644 wpa_supplicant@ "${pkgdir}"/usr/lib/66/service/wpa_supplicant@
-    install -Dm 0644 wpa_supplicant-nl80211@ "${pkgdir}"/usr/lib/66/service/wpa_supplicant-nl80211@
-    install -Dm 0644 wpa_supplicant-wired@ "${pkgdir}"/usr/lib/66/service/wpa_supplicant-wired@
-    install -Dm 0644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE
-}
-
-#--------------------------------------------------------------------------------------
-sha512sums=('SKIP')

version/0.1.2-1/wpa_supplicant

-[main]
-@type = classic
-@description = "wpa_supplicant daemon"
-@user = ( root )
-@options = ( log env )
-
-[start]
-@build = auto
-@execute = ( execl-cmdline -s { wpa_supplicant ${cmd_args} } )
-
-[environment]
-cmd_args=!-udW

version/0.1.2-1/wpa_supplicant-nl80211@

-[main]
-@type = classic
-@description = "wpa_supplicant-nl80211-@I daemon"
-@user = ( root )
-@options = ( log env )
-
-[start]
-@build = auto
-@execute = ( execl-cmdline -s { wpa_supplicant ${cmd_args} } )
-
-[environment]
-cmd_args=!-c/etc/wpa_supplicant/wpa_supplicant-nl80211-@I.conf -Dnl80211 -i@I 

version/0.1.2-1/wpa_supplicant-wired@

-[main]
-@type = classic
-@description = "wpa_supplicant-wired-@I daemon"
-@user = ( root )
-@options = ( log env )
-
-[start]
-@build = auto
-@execute = ( execl-cmdline -s { wpa_supplicant ${cmd_args} } )
-
-[environment]
-cmd_args=!-c/etc/wpa_supplicant/wpa_supplicant-wired-@I.conf -Dwired -i@I 

version/0.1.2-1/wpa_supplicant@

-[main]
-@type = classic
-@description = "wpa_supplicant-@I daemon"
-@user = ( root )
-@options = ( log env )
-
-[start]
-@build = auto
-@execute = ( execl-cmdline -s { wpa_supplicant ${cmd_args} } )
-
-[environment]
-cmd_args=!-c/etc/wpa_supplicant/wpa_supplicant-@I.conf -i@I 

version/0.1.3-1/LICENSE

-Copyright (c) 2018-2019 Eric Vidal <eric@obarun.org>
-All rights reserved.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

version/0.1.3-1/PKGBUILD

-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : https://framagit.org/observice/wpa_supplicant-66serv
-#--------------------------------------------------------------------------------------
-
-pkgname=wpa_supplicant-66serv
-pkgver=0.1.3
-pkgrel=1
-pkgdesc="wpa_supplicant services for 66 tools"
-arch=('x86_64')
-url="https://framagit.org/pkg/observice/${pkgname}.git"
-license=('ISC')
-
-track=branch
-target=master
-source=("${pkgname}::git+${url}#${track}=${target}")
-
-depends=(
-    '66'
-    'wpa_supplicant')
-
-makedepends=(
-    'git')
-
-#--------------------------------------------------------------------------------------
-package() {
-    cd "${pkgname}/trunk"
-
-    install -Dm 0644 wpa_supplicant "${pkgdir}"/usr/lib/66/service/wpa_supplicant
-    install -Dm 0644 wpa_supplicant@ "${pkgdir}"/usr/lib/66/service/wpa_supplicant@
-    install -Dm 0644 wpa_supplicant-nl80211@ "${pkgdir}"/usr/lib/66/service/wpa_supplicant-nl80211@
-    install -Dm 0644 wpa_supplicant-wired@ "${pkgdir}"/usr/lib/66/service/wpa_supplicant-wired@
-    install -Dm 0644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE
-}
-
-#--------------------------------------------------------------------------------------
-sha512sums=('SKIP')

version/0.1.3-1/wpa_supplicant

-[main]
-@type = classic
-@description = "wpa_supplicant daemon"
-@user = ( root )
-@options = ( log env )
-
-[start]
-@build = auto
-@execute = ( execl-cmdline -s { wpa_supplicant ${cmd_args} } )
-
-[environment]
-cmd_args=!-udW

version/0.1.3-1/wpa_supplicant-nl80211@

-[main]
-@type = classic
-@description = "wpa_supplicant-nl80211@@I daemon"
-@user = ( root )
-@options = ( log env )
-
-[start]
-@build = auto
-@execute = ( execl-cmdline -s { wpa_supplicant ${cmd_args} } )
-
-[environment]
-cmd_args=!-c/etc/wpa_supplicant/wpa_supplicant-nl80211-@I.conf -Dnl80211 -i@I