diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | cc.deb.PKGBUILD | 10 | ||||
| -rw-r--r-- | deb.PKGBUILD | 12 | ||||
| -rw-r--r-- | dev.PKGBUILD | 7 | ||||
| -rw-r--r-- | git.PKGBUILD | 10 | ||||
| -rw-r--r-- | skywire-scripts.tar.gz | bin | 23976 -> 23977 bytes | |||
| -rwxr-xr-x | updates.sh | 11 |
8 files changed, 29 insertions, 39 deletions
@@ -1,7 +1,7 @@ pkgbase = skywire pkgdesc = Skywire Mainnet Node implementation. Skycoin.com pkgver = 1.0.0 - pkgrel = 7 + pkgrel = 8 url = https://github.com/skycoin/skywire install = skywire.install arch = i686 @@ -19,9 +19,9 @@ pkgbase = skywire makedepends = go makedepends = musl makedepends = kernel-headers-musl - source = https://github.com/skycoin/skywire/archive/refs/tags/v1.0.0-rc7.tar.gz + source = https://github.com/skycoin/skywire/archive/refs/tags/v1.0.0.tar.gz source = skywire-scripts.tar.gz - sha256sums = 5d724bd9ad3dcfafcbb1070391c0541bc80b13cab6d0b3dd290cdda7af39b4f9 - sha256sums = 1b149ef7eb5ce5ba5b7809a1ee0a4f1e1582506181812f60331e2817822cee69 + sha256sums = fa81cd4e7860bcb5ae49b7b6231c26ea1e4a5846323e433df0a03400129dabdf + sha256sums = d6f89b3363917253cf1acdff99d015468dd23a34e70fe02c3c445e455e30a16d pkgname = skywire @@ -7,9 +7,9 @@ _githuborg=${_projectname} pkgdesc="Skywire Mainnet Node implementation. Skycoin.com" _pkggopath="github.com/${_githuborg}/${_pkgname}" pkgver='1.0.0' -pkgrel=7 -#pkgrel=7 -_rc='-rc7' +pkgrel=8 +#pkgrel=8 +_rc='' _pkgver="${pkgver}${_rc}" _tag_ver="v${_pkgver}" arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' ) @@ -21,8 +21,8 @@ _scripts=${_pkgname}-scripts source=("${url}/archive/refs/tags/${_tag_ver}.tar.gz" "${_scripts}.tar.gz" ) -sha256sums=('5d724bd9ad3dcfafcbb1070391c0541bc80b13cab6d0b3dd290cdda7af39b4f9' - '1b149ef7eb5ce5ba5b7809a1ee0a4f1e1582506181812f60331e2817822cee69') +sha256sums=('fa81cd4e7860bcb5ae49b7b6231c26ea1e4a5846323e433df0a03400129dabdf' + 'd6f89b3363917253cf1acdff99d015468dd23a34e70fe02c3c445e455e30a16d') prepare() { # https://wiki.archlinux.org/index.php/Go_package_guidelines mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin ${srcdir}/go/apps diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD index b9814a80acaf..6e7d2603067c 100644 --- a/cc.deb.PKGBUILD +++ b/cc.deb.PKGBUILD @@ -5,9 +5,9 @@ _githuborg=${_projectname} pkgdesc="Skywire Mainnet Node implementation. Debian package; cross-compile." _pkggopath="github.com/${_githuborg}/${_pkgname}" pkgver='1.0.0' -pkgrel=7 -#pkgrel=7 -_rc='-rc7' +pkgrel=8 +#pkgrel=8 +_rc='' _pkgver="${pkgver}${_rc}" _tag_ver="v${_pkgver}" _pkgrel=${pkgrel} @@ -25,8 +25,8 @@ _scripts="skywire-scripts" source=("${url}/archive/refs/tags/${_tag_ver}.tar.gz" "${_scripts}.tar.gz" ) -sha256sums=('5d724bd9ad3dcfafcbb1070391c0541bc80b13cab6d0b3dd290cdda7af39b4f9' - '1b149ef7eb5ce5ba5b7809a1ee0a4f1e1582506181812f60331e2817822cee69') +sha256sums=('fa81cd4e7860bcb5ae49b7b6231c26ea1e4a5846323e433df0a03400129dabdf' + 'd6f89b3363917253cf1acdff99d015468dd23a34e70fe02c3c445e455e30a16d') #tar -czvf skywire-deb-scripts.tar.gz skywire-deb-scripts #updpkgsums deb.PKGBUILD diff --git a/deb.PKGBUILD b/deb.PKGBUILD index fd9383caf47a..d855c7657f54 100644 --- a/deb.PKGBUILD +++ b/deb.PKGBUILD @@ -9,10 +9,9 @@ pkgdesc="Skywire Mainnet Node implementation. Develop Banch. Debian package" _pkgarch=$(dpkg --print-architecture) #leave arch package as any arch=('any') -#manually version for now pkgver='1.0.0' -pkgrel=7 -_rc='-rc7' +pkgrel=8 +_rc='' _pkgver="${pkgver}${_rc}" _tag_ver="v${_pkgver}" _pkgrel=${pkgrel} @@ -25,8 +24,8 @@ _debdeps="" _scripts="skywire-scripts" source=( "${url}/archive/refs/tags/${_tag_ver}.tar.gz" "${_scripts}.tar.gz" ) -sha256sums=('5d724bd9ad3dcfafcbb1070391c0541bc80b13cab6d0b3dd290cdda7af39b4f9' - '1b149ef7eb5ce5ba5b7809a1ee0a4f1e1582506181812f60331e2817822cee69') +sha256sums=('fa81cd4e7860bcb5ae49b7b6231c26ea1e4a5846323e433df0a03400129dabdf' + 'd6f89b3363917253cf1acdff99d015468dd23a34e70fe02c3c445e455e30a16d') prepare() { # https://wiki.archlinux.org/index.php/Go_package_guidelines @@ -76,16 +75,13 @@ echo "Maintainer: skycoin" >> ${srcdir}/control echo "Description: ${pkgdesc}" >> ${srcdir}/control } -#speed up the build for testing - there's a risk of using old binaries. _buildbins() { _GOHERE=$2 #target bin dir _binpath=$3 #find the binary here- expecting 'apps/' or empty _binname=$1 #which binary to build _msg2 "building ${_binname} binary" -if [[ ! -f ${_GOHERE}/${_binname} ]] ; then #don't waste time rebuilding existing bins cd ${_cmddir}/${_binpath}${_binname} go build -trimpath --ldflags '-s -w -linkmode external -extldflags "-static" -buildid=' -o $_GOHERE/ . -fi } package() { diff --git a/dev.PKGBUILD b/dev.PKGBUILD index 34123c534878..ce8eb1d4bc98 100644 --- a/dev.PKGBUILD +++ b/dev.PKGBUILD @@ -8,7 +8,7 @@ pkgdesc="Skywire Mainnet Node implementation; develop branch - Debian package." _pkggopath="github.com/${_githuborg}/${_pkgname}" pkgver='autogenerated' pkgrel=1 -#pkgrel=7 +#pkgrel=8 _pkgarch=$(dpkg --print-architecture) _pkgver=${pkgver} _pkgrel=${pkgrel} @@ -24,10 +24,7 @@ source=("git+${url}.git#branch=develop" "${_scripts}.tar.gz" ) sha256sums=('SKIP' - '1b149ef7eb5ce5ba5b7809a1ee0a4f1e1582506181812f60331e2817822cee69') - -#tar -czvf skywire-deb-scripts.tar.gz skywire-deb-scripts -#updpkgsums deb.PKGBUILD + 'd6f89b3363917253cf1acdff99d015468dd23a34e70fe02c3c445e455e30a16d') pkgver() { _version=$(git ls-remote --tags --refs --sort="version:refname" ${url}.git | tail -n1) diff --git a/git.PKGBUILD b/git.PKGBUILD index d581493d95a8..8587f3104556 100644 --- a/git.PKGBUILD +++ b/git.PKGBUILD @@ -8,7 +8,7 @@ pkgdesc="Skywire Mainnet Node implementation. Skycoin.com" _pkggopath="github.com/${_githuborg}/${_pkgname}" pkgver='autogenerated' pkgrel=1 -#pkgrel=7 +#pkgrel=8 arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' ) url="https://${_pkggopath}" license=() @@ -19,7 +19,7 @@ source=("git+${url}.git#branch=develop" "${_scripts}.tar.gz" ) sha256sums=('SKIP' - '1b149ef7eb5ce5ba5b7809a1ee0a4f1e1582506181812f60331e2817822cee69') + 'd6f89b3363917253cf1acdff99d015468dd23a34e70fe02c3c445e455e30a16d') pkgver() { _version=$(git ls-remote --tags --refs --sort="version:refname" ${url}.git | tail -n1) @@ -147,9 +147,3 @@ _msg2() { local mesg=$1; shift printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" } - -_msg3() { -(( QUIET )) && return -local mesg=$1; shift -printf "${BLUE} -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" -} diff --git a/skywire-scripts.tar.gz b/skywire-scripts.tar.gz Binary files differindex 099150d4a82f..c69ec8ec9612 100644 --- a/skywire-scripts.tar.gz +++ b/skywire-scripts.tar.gz diff --git a/updates.sh b/updates.sh index 6f0b66a9ad53..b9258798160b 100755 --- a/updates.sh +++ b/updates.sh @@ -6,10 +6,11 @@ _version=$(git ls-remote --tags --refs --sort="version:refname" https://github.c _version=${_version##*/} _version=${_version%%-*} _version=${_version//v/} -_vrc=$(git ls-remote --tags --refs --sort="version:refname" https://github.com/skycoin/skywire.git | tail -n1 | grep -- -rc) -if [[ $_vrc != "" ]]; then - _vrc="-${_vrc##*-}" -fi +#Uncomment to use release candidates during pre-release testing +#_vrc=$(git ls-remote --tags --refs --sort="version:refname" https://github.com/skycoin/skywire.git | tail -n1 | grep -- -rc) +#if [[ $_vrc != "" ]]; then +# _vrc="-${_vrc##*-}" +#fi echo ${_version} echo ${_vrc} echo "updating checksums and version for PKGBUILD" @@ -24,6 +25,8 @@ echo "updating checksums and version for git.PKGBUILD" [[ -f git.PKGBUILD ]] && sed -i "s/^pkgver=.*/pkgver='autogenerated'/" git.PKGBUILD && updpkgsums git.PKGBUILD && _gitPKGBUILD="git.PKGBUILD" echo "creating .SRCINFO" makepkg --printsrcinfo > .SRCINFO +sha256sum skywire-scripts.tar.gz echo "don't forget to increment pkgrel if you edited the PKGBUILD" +echo echo "git add -f ${_debPKGBUILD} ${_ccdebPKGBUILD} ${_devPKGBUILD} ${_gitPKGBUILD} PKGBUILD .SRCINFO skywire-scripts.tar.gz updates.sh test.sh" echo 'git commit -m " "' |