Fix xgo creating files as `root` (#1210)
This commit is contained in:
parent
dcaf8caed0
commit
6a1cd7f2b0
|
@ -36,7 +36,7 @@ tags
|
|||
# used by the Makefile
|
||||
/build/_workspace/
|
||||
/build/bin/
|
||||
/vendor/github.com/karalabe/xgo
|
||||
/vendor/github.com/status-im/xgo
|
||||
|
||||
# travis
|
||||
profile.tmp
|
||||
|
|
3
Makefile
3
Makefile
|
@ -195,7 +195,8 @@ xgo-docker-images: ##@docker Build xgo docker images
|
|||
|
||||
xgo:
|
||||
docker pull $(XGOIMAGE)
|
||||
go get github.com/karalabe/xgo
|
||||
go get github.com/status-im/xgo
|
||||
mkdir -p $(GOBIN)
|
||||
|
||||
install-os-dependencies:
|
||||
_assets/scripts/install_deps.sh
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
FROM karalabe/xgo-1.10.x
|
||||
|
||||
VOLUME [ "/build", "/deps-cache" ]
|
||||
|
||||
# Inject the container entry point, the build script (patched for Status bindings conditional builds of C code)
|
||||
ADD build.sh /build.sh
|
||||
ENV BUILD /build.sh
|
||||
|
|
|
@ -298,6 +298,9 @@ for TARGET in $TARGETS; do
|
|||
(cd $archive && zip -r $bundle *)
|
||||
rm -rf $jni $archive
|
||||
fi
|
||||
|
||||
# Fix up permissions on bundle file
|
||||
chown $UID:$GID $bundle
|
||||
fi
|
||||
# Clean up the android builds, toolchains and runtimes
|
||||
rm -rf /build-android-aar
|
||||
|
@ -583,6 +586,8 @@ for TARGET in $TARGETS; do
|
|||
echo -e "framework module \"$title\" {\n header \"$title.h\"\n export *\n}" > $framework/Versions/A/Modules/module.modulemap
|
||||
(cd $framework && ln -nsf Versions/A/Modules Modules)
|
||||
|
||||
# Fix up permissions on bundle file
|
||||
chown $UID:$GID /build/$NAME-ios-$PLATFORM-framework
|
||||
chmod 777 -R /build/$NAME-ios-$PLATFORM-framework
|
||||
fi
|
||||
rm -rf /build-ios-fw
|
||||
|
|
|
@ -36,7 +36,7 @@ node('linux') {
|
|||
// }
|
||||
|
||||
stage('Build') {
|
||||
sh 'go get github.com/karalabe/xgo'
|
||||
sh 'go get github.com/status-im/xgo'
|
||||
|
||||
parallel (
|
||||
'statusgo-android': {
|
||||
|
|
|
@ -49,7 +49,7 @@ node('linux') {
|
|||
}
|
||||
|
||||
stage('Build') {
|
||||
sh 'go get github.com/karalabe/xgo'
|
||||
sh 'go get github.com/status-im/xgo'
|
||||
|
||||
parallel (
|
||||
'statusgo-android': {
|
||||
|
|
Loading…
Reference in New Issue