Merge pull request 'fix mac deploy' (#89) from macosarm64 into trunk
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
Reviewed-on: #89
This commit is contained in:
commit
231e27d116
|
@ -169,7 +169,7 @@ steps:
|
||||||
status: [ success ]
|
status: [ success ]
|
||||||
commands:
|
commands:
|
||||||
- export PATH=$PATH:/usr/local/go/bin/
|
- export PATH=$PATH:/usr/local/go/bin/
|
||||||
- make libCwtch.arm.dylib
|
- make libCwtch.arm64.dylib
|
||||||
- name: deploy-buildfiles
|
- name: deploy-buildfiles
|
||||||
environment:
|
environment:
|
||||||
BUILDFILES_KEY:
|
BUILDFILES_KEY:
|
||||||
|
@ -184,7 +184,7 @@ steps:
|
||||||
- chmod 400 ~/id_rsa
|
- chmod 400 ~/id_rsa
|
||||||
- export DIR=libCwtch-go-macos-`cat BUILDDATE`-`cat VERSION`
|
- export DIR=libCwtch-go-macos-`cat BUILDDATE`-`cat VERSION`
|
||||||
- mkdir $DIR
|
- mkdir $DIR
|
||||||
- mv libCwtch.dylib $DIR/
|
- mv libCwtch.x64.dylib $DIR/
|
||||||
- mv libCwtch.arm64.dylib $DIR/
|
- mv libCwtch.arm64.dylib $DIR/
|
||||||
- cd $DIR
|
- cd $DIR
|
||||||
- find . -type f -exec shasum -a 512 {} \; > ./../sha512s.txt
|
- find . -type f -exec shasum -a 512 {} \; > ./../sha512s.txt
|
||||||
|
|
4
Makefile
4
Makefile
|
@ -8,7 +8,7 @@ all: linux android windows
|
||||||
|
|
||||||
linux: libCwtch.so
|
linux: libCwtch.so
|
||||||
|
|
||||||
macos: libCwtch.x64.dylib libCwtch.arm.dylib
|
macos: libCwtch.x64.dylib libCwtch.arm64.dylib
|
||||||
|
|
||||||
android: cwtch.aar
|
android: cwtch.aar
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ libCwtch.x64.dylib: lib.go
|
||||||
./switch-ffi.sh
|
./switch-ffi.sh
|
||||||
go build -ldflags "-X main.buildVer=$(shell git describe --tags) -X main.buildDate=$(shell date +%G-%m-%d-%H-%M)" -buildmode c-shared -o libCwtch.x64.dylib
|
go build -ldflags "-X main.buildVer=$(shell git describe --tags) -X main.buildDate=$(shell date +%G-%m-%d-%H-%M)" -buildmode c-shared -o libCwtch.x64.dylib
|
||||||
|
|
||||||
libCwtch.arm.dylib: lib.go
|
libCwtch.arm64.dylib: lib.go
|
||||||
./switch-ffi.sh
|
./switch-ffi.sh
|
||||||
env GOARCH=arm64 GOOS=darwin CGO_ENABLED=1 go build -ldflags "-X main.buildVer=$(shell git describe --tags) -X main.buildDate=$(shell date +%G-%m-%d-%H-%M)" -buildmode c-shared -o libCwtch.arm64.dylib
|
env GOARCH=arm64 GOOS=darwin CGO_ENABLED=1 go build -ldflags "-X main.buildVer=$(shell git describe --tags) -X main.buildDate=$(shell date +%G-%m-%d-%H-%M)" -buildmode c-shared -o libCwtch.arm64.dylib
|
||||||
|
|
||||||
|
|
Reference in New Issue