change to use new go-cross-compile container
continuous-integration/drone/pr Build is passing Details
continuous-integration/drone/push Build is pending Details

This commit is contained in:
Dan Ballard 2024-03-03 11:09:05 -08:00
parent 83c84b2049
commit 7a65efaa78
2 changed files with 6 additions and 6 deletions

View File

@ -5,7 +5,7 @@ name: linux-android-windows-test
steps:
- name: fetch
image: golang:1.21.5
image: openpriv/go-cross-compile:2024.02
volumes:
- name: deps
path: /go
@ -26,7 +26,7 @@ steps:
- export GOSUMDB="off"
- name: build-linux
image: openpriv/golangxarm:1.21.5-bullseye
image: openpriv/go-cross-compile:2024.02
volumes:
- name: deps
path: /go
@ -36,7 +36,7 @@ steps:
- make linux
- name: build-android
image: openpriv/android-go-mobile:2024.01
image: openpriv/go-cross-compile:2024.02
volumes:
- name: deps
path: /go
@ -49,7 +49,7 @@ steps:
- make android
- name: build-windows
image: openpriv/mingw-go:2024.01
image: openpriv/go-cross-compile:2024.02
environment:
GOPATH: /go
volumes:
@ -60,7 +60,7 @@ steps:
- make windows
- name: deploy-buildfiles
image: kroniak/ssh-client
image: openpriv/go-cross-compile:2024.02
pull: if-not-exists
environment:
BUILDFILES_KEY:

View File

@ -48,7 +48,7 @@ libCwtch.x.so: lib.go
./switch-ffi.sh
mkdir -p build/linux
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.h build/linux/libCwtch.h
endif