Compare commits
2 Commits
Author | SHA1 | Date |
---|---|---|
Dan Ballard | 7a65efaa78 | |
Sarah Jamie Lewis | 83c84b2049 |
10
.drone.yml
10
.drone.yml
|
@ -5,7 +5,7 @@ name: linux-android-windows-test
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: fetch
|
- name: fetch
|
||||||
image: golang:1.21.5
|
image: openpriv/go-cross-compile:2024.02
|
||||||
volumes:
|
volumes:
|
||||||
- name: deps
|
- name: deps
|
||||||
path: /go
|
path: /go
|
||||||
|
@ -26,7 +26,7 @@ steps:
|
||||||
- export GOSUMDB="off"
|
- export GOSUMDB="off"
|
||||||
|
|
||||||
- name: build-linux
|
- name: build-linux
|
||||||
image: openpriv/golangxarm:1.21.5-bullseye
|
image: openpriv/go-cross-compile:2024.02
|
||||||
volumes:
|
volumes:
|
||||||
- name: deps
|
- name: deps
|
||||||
path: /go
|
path: /go
|
||||||
|
@ -36,7 +36,7 @@ steps:
|
||||||
- make linux
|
- make linux
|
||||||
|
|
||||||
- name: build-android
|
- name: build-android
|
||||||
image: openpriv/android-go-mobile:2024.01
|
image: openpriv/go-cross-compile:2024.02
|
||||||
volumes:
|
volumes:
|
||||||
- name: deps
|
- name: deps
|
||||||
path: /go
|
path: /go
|
||||||
|
@ -49,7 +49,7 @@ steps:
|
||||||
- make android
|
- make android
|
||||||
|
|
||||||
- name: build-windows
|
- name: build-windows
|
||||||
image: openpriv/mingw-go:2024.01
|
image: openpriv/go-cross-compile:2024.02
|
||||||
environment:
|
environment:
|
||||||
GOPATH: /go
|
GOPATH: /go
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -60,7 +60,7 @@ steps:
|
||||||
- make windows
|
- make windows
|
||||||
|
|
||||||
- name: deploy-buildfiles
|
- name: deploy-buildfiles
|
||||||
image: kroniak/ssh-client
|
image: openpriv/go-cross-compile:2024.02
|
||||||
pull: if-not-exists
|
pull: if-not-exists
|
||||||
environment:
|
environment:
|
||||||
BUILDFILES_KEY:
|
BUILDFILES_KEY:
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -48,7 +48,7 @@ libCwtch.x.so: lib.go
|
||||||
./switch-ffi.sh
|
./switch-ffi.sh
|
||||||
mkdir -p build/linux
|
mkdir -p build/linux
|
||||||
ifeq ($(ARCH),x86_64)
|
ifeq ($(ARCH),x86_64)
|
||||||
env CGO_ENABLED=1 CC=$(ARM_X_CC) GOARCH=arm64 go build -trimpath -ldflags "-buildid=autobindings-v0.0.3-22-g20065b2 -X main.buildVer=autobindings-v0.0.3-22-g20065b2 -X main.buildDate=2023-05-01-21-41" -buildmode c-shared -o libCwtch.x.so
|
env CGO_ENABLED=1 CC=$(ARM_X_CC) GOARCH=arm64 go build -trimpath -ldflags "-buildid=autobindings-$(shell git describe --tags) -X main.buildVer=autobindings-$(shell git describe --tags) -X main.buildDate=$(shell git log -1 --format=%cd --date=format:%G-%m-%d-%H-%M)" -buildmode c-shared -o libCwtch.x.so
|
||||||
mv libCwtch.x.so build/linux/libCwtch.arm64.so
|
mv libCwtch.x.so build/linux/libCwtch.arm64.so
|
||||||
mv libCwtch.x.h build/linux/libCwtch.h
|
mv libCwtch.x.h build/linux/libCwtch.h
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -247,7 +247,7 @@ func ReconnectCwtchForeground() {
|
||||||
|
|
||||||
settingsJson, _ := json.Marshal(application.ReadSettings())
|
settingsJson, _ := json.Marshal(application.ReadSettings())
|
||||||
application.GetPrimaryBus().Publish(event.NewEvent(settings.UpdateGlobalSettings, map[event.Field]string{event.Data: string(settingsJson)}))
|
application.GetPrimaryBus().Publish(event.NewEvent(settings.UpdateGlobalSettings, map[event.Field]string{event.Data: string(settingsJson)}))
|
||||||
application.GetPrimaryBus().Publish(event.NewEvent(settings.CwtchStarted, map[event.Field]string{}))
|
application.GetPrimaryBus().Publish(event.NewEvent(settings.CwtchStarted, map[event.Field]string{utils.ReloadEvent: event.True}))
|
||||||
application.QueryACNStatus()
|
application.QueryACNStatus()
|
||||||
application.QueryACNVersion()
|
application.QueryACNVersion()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue