Skip to content

add musl target to kos-go #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fsiggor merged 16 commits into from
Sep 23, 2025
Merged

add musl target to kos-go #212

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6585775
modify cgo directives to work with vendor path
klever-patrick Sep 22, 2025
c545ff9
add steps to commit lib
klever-patrick Sep 23, 2025
c7b7e92
add lib folder to path-ignore
klever-patrick Sep 23, 2025
a9af963
run build-go only when bindings change
klever-patrick Sep 23, 2025
1462871
add musl support
klever-patrick Sep 23, 2025
b56bde0
rename kos-go workflow
klever-patrick Sep 23, 2025
07c11ea
fix musl testing rule
klever-patrick Sep 23, 2025
6d5618b
avoid push-on-PR failures and CI loops
klever-patrick Sep 23, 2025
6c13db2
grant token permissions to push commits
klever-patrick Sep 23, 2025
91d9246
Update Linux Go bindings library
klever-patrick Sep 23, 2025
eddeb98
Update macOS Go bindings library
klever-patrick Sep 23, 2025
3a95991
add musl gcc
klever-patrick Sep 23, 2025
01891de
Merge remote-tracking branch 'refs/remotes/origin/fix/cgo-vendor' int…
klever-patrick Sep 23, 2025
722161b
add musl gcc directly on kos-go workflow
klever-patrick Sep 23, 2025
8785b4d
Update Linux musl Go bindings library
klever-patrick Sep 23, 2025
65a4d9a
force ci to run
klever-patrick Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 134 additions & 0 deletions .github/workflows/kos-go.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
name: KOS-Go Checks

on:
push:
paths:
- 'packages/kos-go/kos_mobile/**'
branches:
- develop
paths-ignore:
- '**/*.md'
- '.gitignore'
- '.github/**'
pull_request:
Comment thread
coderabbitai[bot] marked this conversation as resolved.
branches:
- develop

jobs:
Comment thread
coderabbitai[bot] marked this conversation as resolved.
build-go-linux:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
submodules: recursive

- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: '1.21'

- name: RustUp
uses: klever-io/kos-rs/.github/actions/rustup@develop
with:
with_cache: true

- name: Build Linux Go bindings
run: make build-go

- name: Copy .so to Go package
run: |
mkdir -p packages/kos-go/kos_mobile/lib/linux-amd64
cp target/release/libkos_mobile.so packages/kos-go/kos_mobile/lib/linux-amd64/

- name: Commit and push changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: "Update Linux Go bindings library"
file_pattern: "packages/kos-go/kos_mobile/lib/linux-amd64/libkos_mobile.so"

Comment thread
coderabbitai[bot] marked this conversation as resolved.
- name: Run Go tests
run: |
cd packages/kos-go
make test

build-go-linux-musl:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
submodules: recursive

- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: '1.21'

- name: RustUp
uses: klever-io/kos-rs/.github/actions/rustup@develop
with:
with_cache: true

- name: Build Linux Go bindings
run:
rustup target add x86_64-unknown-linux-musl && make build-go-musl

Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
Comment thread
klever-patrick marked this conversation as resolved.
- name: Copy .so to Go package
run: |
mkdir -p packages/kos-go/kos_mobile/lib/linux-amd64
cp target/x86_64-unknown-linux-musl/release/libkos_mobile.so packages/kos-go/kos_mobile/lib/linux-musl-amd64/

Comment thread
coderabbitai[bot] marked this conversation as resolved.
- name: Commit and push changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: "Update Linux Go bindings library"
file_pattern: "packages/kos-go/kos_mobile/lib/linux-musl/amd64/libkos_mobile.so"
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated

- name: Run Go tests
run: |
cd packages/kos-go
make test

Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated

build-go-mac:
runs-on: [ "macos-14" ]
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
submodules: recursive

- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: '1.21'

- name: Install Rust toolchain
shell: bash
run: |
set -e
rustup component add --toolchain stable rustfmt clippy
rustup default stable

- name: Setup protobuf
run: brew install protobuf

- name: Build Mac Go bindings
run: make build-go

- name: Copy dylib to Go package
run: |
mkdir -p packages/kos-go/kos_mobile/lib/darwin-aarch64
cp target/release/libkos_mobile.dylib packages/kos-go/kos_mobile/lib/darwin-aarch64/

- name: Commit and push changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: "Update macOS Go bindings library"
file_pattern: "packages/kos-go/kos_mobile/lib/darwin-aarch64/libkos_mobile.dylib"

- name: Run Go tests
run: |
cd packages/kos-go
make test
70 changes: 1 addition & 69 deletions .github/workflows/pull-develop.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
- '**/*.md'
- '.gitignore'
- '.github/**'
- 'packages/kos-go/kos_mobile/lib/**'

jobs:
format:
Expand Down Expand Up @@ -66,72 +67,3 @@ jobs:

- name: Build
run: make webpack-npm

build-go-linux:
needs: [ format ]
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
submodules: recursive

- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: '1.21'

- name: RustUp
uses: klever-io/kos-rs/.github/actions/rustup@develop
with:
with_cache: true

- name: Build Linux Go bindings
run: make build-go

- name: Copy .so to Go package
run: |
mkdir -p packages/kos-go/kos_mobile/lib/linux-amd64
cp target/release/libkos_mobile.so packages/kos-go/kos_mobile/lib/linux-amd64/

- name: Run Go tests
run: |
cd packages/kos-go
make test

build-go-mac:
needs: [ format ]
runs-on: [ "macos-14" ]
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
submodules: recursive

- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: '1.21'

- name: Install Rust toolchain
shell: bash
run: |
set -e
rustup component add --toolchain stable rustfmt clippy
rustup default stable

- name: Setup protobuf
run: brew install protobuf

- name: Build Mac Go bindings
run: make build-go

- name: Copy dylib to Go package
run: |
mkdir -p packages/kos-go/kos_mobile/lib/darwin-aarch64
cp target/release/libkos_mobile.dylib packages/kos-go/kos_mobile/lib/darwin-aarch64/

- name: Run Go tests
run: |
cd packages/kos-go
make test
7 changes: 6 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,12 @@ build-ios:

build-go:
cargo install uniffi-bindgen-go --git https://github.com/NordSecurity/uniffi-bindgen-go --tag v0.4.0+v0.28.3 && \
cargo build --release --package kos-mobile && uniffi-bindgen-go --library target/release/libkos_mobile.a --out-dir ./packages/kos-go
cargo build --release --package kos-mobile && uniffi-bindgen-go --library target/release/libkos_mobile.a --out-dir ./packages/kos-go

build-go-musl:
cargo install uniffi-bindgen-go --git https://github.com/NordSecurity/uniffi-bindgen-go --tag v0.4.0+v0.28.3 && \
RUSTFLAGS="-C target-feature=-crt-static" cargo build --release --target x86_64-unknown-linux-musl --package kos-mobile && \
uniffi-bindgen-go --library target/x86_64-unknown-linux-musl/release/libkos_mobile.a --out-dir ./packages/kos-go

test-ios: build-ios
cd packages/kos-mobile/ios/framework/KOSMobile && xcodebuild \
Expand Down
1 change: 1 addition & 0 deletions packages/kos-go/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
vendor
1 change: 1 addition & 0 deletions packages/kos-go/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
16 changes: 16 additions & 0 deletions packages/kos-go/kos_mobile/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
*.test

*.out
coverage.*
*.coverprofile
profile.cov

vendor/

go.work
go.work.sum

.env

.idea/
.vscode/
10 changes: 5 additions & 5 deletions packages/kos-go/kos_mobile/cgo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package kos_mobile

/*
#cgo CFLAGS: -I.
#cgo linux LDFLAGS: -L./lib/linux-amd64 -lkos_mobile -Wl,-rpath,${SRCDIR}/lib/linux-amd64
#cgo darwin,amd64 LDFLAGS: -L./lib/darwin-amd64 -lkos_mobile -Wl,-rpath,${SRCDIR}/lib/darwin-amd64
#cgo darwin,arm64 LDFLAGS: -L./lib/darwin-aarch64 -lkos_mobile -Wl,-rpath,${SRCDIR}/lib/darwin-aarch64

#cgo CFLAGS: -I. -I${SRCDIR}
#cgo linux,!musl LDFLAGS: -L${SRCDIR}/lib/linux-amd64 -lkos_mobile -Wl,-rpath,${SRCDIR}/lib/linux-amd64
#cgo linux,musl LDFLAGS: -L${SRCDIR}/lib/linux-musl-amd64 -lkos_mobile
#cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/lib/darwin-amd64 -lkos_mobile -Wl,-rpath,${SRCDIR}/lib/darwin-amd64
#cgo darwin,arm64 LDFLAGS: -L${SRCDIR}/lib/darwin-aarch64 -lkos_mobile -Wl,-rpath,${SRCDIR}/lib/darwin-aarch64
Comment thread
klever-patrick marked this conversation as resolved.
#include "kos_mobile.h"
#include <stdlib.h>
*/
Expand Down
Binary file added packages/kos-go/kos_mobile/lib/linux-musl-amd64/libkos_mobile.so
View file
Open in desktop
Binary file not shown.