Merge pull request 'fix mac deploy' (#89) from macosarm64 into trunk

Reviewed-on: cwtch.im/libcwtch-go#89
Sarah Jamie Lewis 3 months ago
commit 231e27d116
  1. 4
      .drone.yml
  2. 4
      Makefile

@ -169,7 +169,7 @@ steps:
status: [ success ]
commands:
- export PATH=$PATH:/usr/local/go/bin/
- make libCwtch.arm.dylib
- make libCwtch.arm64.dylib
- name: deploy-buildfiles
environment:
BUILDFILES_KEY:
@ -184,7 +184,7 @@ steps:
- chmod 400 ~/id_rsa
- export DIR=libCwtch-go-macos-`cat BUILDDATE`-`cat VERSION`
- mkdir $DIR
- mv libCwtch.dylib $DIR/
- mv libCwtch.x64.dylib $DIR/
- mv libCwtch.arm64.dylib $DIR/
- cd $DIR
- find . -type f -exec shasum -a 512 {} \; > ./../sha512s.txt

@ -8,7 +8,7 @@ all: linux android windows
linux: libCwtch.so
macos: libCwtch.x64.dylib libCwtch.arm.dylib
macos: libCwtch.x64.dylib libCwtch.arm64.dylib
android: cwtch.aar
@ -22,7 +22,7 @@ libCwtch.x64.dylib: lib.go
./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
libCwtch.arm.dylib: lib.go
libCwtch.arm64.dylib: lib.go
./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

Loading…
Cancel
Save