Commit e1805abb authored by Slugger@Github's avatar Slugger@Github
Browse files

patch build file to handle bugging JRE on some platforms

parent cecf8a59
Pipeline #66364 failed with stages
in 7 minutes and 27 seconds
......@@ -11,17 +11,17 @@ makedepends="git openjdk8"
depends="wireguard-tools openjdk8-jre-base sudo iputils"
install="$pkgname.pre-install $pkgname.post-install"
subpackages="$pkgname-doc $pkgname-openrc"
#source="$pkgname-$pkgver.tar.gz::https://github.com/Slugger/piawgmgr/archive/$pkgver.tar.gz"
source="jre-file-bug.patch"
builddir="$srcdir/piawgmgr"
_apkoutdir="$builddir/build/apk/piawgmgr"
_jaroutdir="$builddir/build/libs"
prepare() { # the jar must be built from git repo; build process extracts data from git repo
default_prepare
cd "$srcdir"
git clone $url.git
cd piawgmgr
git checkout $pkgver
default_prepare
}
build() {
......@@ -45,3 +45,4 @@ package() {
install -m644 -D "$_apkoutdir"/piawgmgr.man.gz "$pkgdir"/usr/share/man/man1/piawgmgr.gz
}
sha512sums="a33b92f2ea065c50f6cd2c3cb0cd4d827977e7e9848f392ecbf28d46ceb5fad466d70e18b04feec859338a0a6a3dbc8f546634a7c054f8750e85e1d6a3a145f7 jre-file-bug.patch"
diff --git a/build.gradle b/build.gradle
index d93b477..ed0c461 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,6 +32,8 @@ versioning {
displayMode = 'snapshot'
snapshot = "-SNAPSHOT+${System.getenv('GITHUB_RUN_NUMBER') ?: '0'}"
branchEnv = ['PIAWGMGR_BRANCH']
+ dirty = { version -> version }
+ noWarningOnDirty = true
}
group = 'com.github.slugger.vpn.pia'
@@ -67,7 +69,8 @@ bootDistTar {
task mkver {
doLast {
def f = new File('build/full.ver')
- f.delete()
+ if(f.exists()) // seems JREs on some platforms throw when delete() fails against JRE specs
+ f.delete()
f << versioning.info.full
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment