Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/workflows/build-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ jobs:

- name: Build package
run: |
unset CI # workaround for "PackageAndroid" target
sudo -E env "PATH=$PATH" bash -lc 'source env.sh && go run mage.go -v ${{ matrix.platform }}'

build-swagger:
Expand Down
28 changes: 28 additions & 0 deletions bin/helpers/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,31 @@ function copy_config {
cp -vrp "bin/package/config/${OS_DIR}/." ${DST_DIR}/config
fi
}

ANDROID_NDK_VERSION="27.1.12297006"

function gomobile_bind_android {
local OUT=$1
local TAGS=$2
local SDK="${ANDROID_HOME:-$ANDROID_SDK_ROOT}"
if [[ -z "$SDK" ]]; then
print_error "ANDROID_HOME is not set"
return 1
fi
export ANDROID_HOME="$SDK"
export ANDROID_NDK_HOME="${SDK}/ndk/${ANDROID_NDK_VERSION}"
if [[ ! -d "$ANDROID_NDK_HOME" ]]; then
print_error "NDK ${ANDROID_NDK_VERSION} missing, install: sdkmanager \"ndk;${ANDROID_NDK_VERSION}\""
return 1
fi
mkdir -p "$(dirname "$OUT")"
local TOOLS_BIN="$PWD/build/gomobile-bin"
GOBIN="$TOOLS_BIN" go install golang.org/x/mobile/cmd/gomobile golang.org/x/mobile/cmd/gobind
PATH="$TOOLS_BIN:$PATH" gomobile bind \
-target=android/arm64,android/arm,android/amd64,android/386 \
-androidapi 21 \
-tags "$TAGS" \
-ldflags "-w -s $(get_linker_ldflags) -checklinkname=0 -extldflags=-Wl,-z,max-page-size=16384" \
-o "$OUT" \
./mobile/mysterium
}
22 changes: 22 additions & 0 deletions bin/package/android/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM golang:1.26.10-bookworm

RUN apt-get update \
&& apt-get install -y --no-install-recommends openjdk-17-jdk-headless unzip \
&& rm -rf /var/lib/apt/lists/*

ENV ANDROID_HOME=/opt/android-sdk
ARG CMDLINE_TOOLS=commandlinetools-linux-15859902_latest.zip
ARG CMDLINE_TOOLS_SHA256=4e4c464f145a7512b57d088ac6c278c03c9eea610886b35a5e0804e74eedf583
ARG NDK_VERSION=27.1.12297006

RUN mkdir -p $ANDROID_HOME/cmdline-tools \
&& curl -fsSL -o /tmp/clt.zip https://dl.google.com/android/repository/$CMDLINE_TOOLS \
&& echo "$CMDLINE_TOOLS_SHA256 /tmp/clt.zip" | sha256sum -c - \
&& unzip -q /tmp/clt.zip -d $ANDROID_HOME/cmdline-tools \
&& mv $ANDROID_HOME/cmdline-tools/cmdline-tools $ANDROID_HOME/cmdline-tools/latest \
&& rm /tmp/clt.zip \
&& yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses >/dev/null \
&& $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "ndk;$NDK_VERSION" "platforms;android-35" >/dev/null

RUN git config --global --add safe.directory /src
WORKDIR /src
26 changes: 3 additions & 23 deletions bin/package_android
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,16 @@
# Packaging script which creates Android AAR (Android Archive).
#
# Usage:
#> bin/package_android <architecture>
#
# Package (specific architecture: arm64, arm):
#> bin/package_android arm64
#> bin/package_android

set -e

source bin/helpers/output.sh
source bin/helpers/functions.sh

DIR_BUILD="build/package"
OUT_BASENAME="mobile-node-${BUILD_VERSION}"
OUT_FILENAME_AAR="${DIR_BUILD}/${OUT_BASENAME}.aar"
OUT_FILENAME_AAR="build/package/mobile-node-${BUILD_VERSION}.aar"

docker run --rm \
-v "$PWD"/$DIR_BUILD:/build \
-v "$PWD":/app \
-w /app \
-e OUT=$OUT_BASENAME \
-e FLAG_V=false \
-e FLAG_X=false \
-e FLAG_RACE=false \
-e FLAG_LDFLAGS="-w -s $(get_linker_ldflags) -checklinkname=0 -extldflags=-Wl,-z,max-page-size=16384" \
-e FLAG_BUILDMODE=default \
-e FLAG_TAGS="android" \
-e TARGETS=android/. \
-e EXT_GOPATH=/ext-go/1 \
-e GO111MODULE=on \
-e GOFLAGS=-mod=mod \
mysteriumnetwork/xgomobile:1.26.2 ./mobile/mysterium
gomobile_bind_android "$OUT_FILENAME_AAR" "android"

if [[ -f $OUT_FILENAME_AAR ]]; then
print_success "Android package ${OUT_FILENAME_AAR} build complete!"
Expand Down
20 changes: 20 additions & 0 deletions bin/package_android_docker
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash
set -e

case "${1:-provider}" in
provider) SCRIPT="bin/package_android_provider" ;;
consumer) SCRIPT="bin/package_android" ;;
*) echo "usage: $0 [provider|consumer]" >&2; exit 1 ;;
esac

IMAGE="mysterium-android-builder:local"

docker build --platform linux/amd64 -t "$IMAGE" bin/package/android

docker run --rm --platform linux/amd64 \
-v "$PWD":/src \
-v mysterium-android-gomod:/go/pkg/mod \
-v mysterium-android-gocache:/root/.cache/go-build \
-e BUILD_VERSION="${BUILD_VERSION:-0.0.0-local}" \
-e BUILD_BRANCH -e BUILD_COMMIT -e BUILD_NUMBER \
"$IMAGE" "$SCRIPT"
26 changes: 3 additions & 23 deletions bin/package_android_provider
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,16 @@
# Packaging script which creates Android AAR (Android Archive).
#
# Usage:
#> bin/package_android <architecture>
#
# Package (specific architecture: arm64, arm):
#> bin/package_android arm64
#> bin/package_android_provider

set -e

source bin/helpers/output.sh
source bin/helpers/functions.sh

DIR_BUILD="build/package"
OUT_BASENAME="provider-mobile-node-${BUILD_VERSION}"
OUT_FILENAME_AAR="${DIR_BUILD}/${OUT_BASENAME}.aar"
OUT_FILENAME_AAR="build/package/provider-mobile-node-${BUILD_VERSION}.aar"

docker run --rm \
-v "$PWD"/$DIR_BUILD:/build \
-v "$PWD":/app \
-w /app \
-e OUT=$OUT_BASENAME \
-e FLAG_V=false \
-e FLAG_X=false \
-e FLAG_RACE=false \
-e FLAG_LDFLAGS="-w -s $(get_linker_ldflags) -checklinkname=0 -extldflags=-Wl,-z,max-page-size=16384" \
-e FLAG_BUILDMODE=default \
-e FLAG_TAGS="android mobile_provider" \
-e TARGETS=android_provider/. \
-e EXT_GOPATH=/ext-go/1 \
-e GO111MODULE=on \
-e GOFLAGS=-mod=mod \
mysteriumnetwork/xgomobile:1.26.2 ./mobile/mysterium
gomobile_bind_android "$OUT_FILENAME_AAR" "android mobile_provider"

if [[ -f $OUT_FILENAME_AAR ]]; then
print_success "Android package ${OUT_FILENAME_AAR} build complete!"
Expand Down
23 changes: 2 additions & 21 deletions ci/packages/package.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (

"github.com/mysteriumnetwork/go-ci/env"
"github.com/mysteriumnetwork/go-ci/job"
"github.com/mysteriumnetwork/go-ci/shell"
"github.com/mysteriumnetwork/node/ci/deb"
"github.com/mysteriumnetwork/node/ci/storage"
"github.com/mysteriumnetwork/node/logconfig"
Expand Down Expand Up @@ -180,19 +179,10 @@ func PackageAndroid() error {
})
logconfig.Bootstrap()

if err := sh.RunV("bin/package_android", "amd64"); err != nil {
if err := sh.RunV("bin/package_android_docker", "consumer"); err != nil {
return err
}

// Artifacts created by xgo (docker) on CI environment are owned by root.
// Chown package folder so we can create a POM (see below) in it.
if _, isCI := os.LookupEnv("CI"); isCI {
err := shell.NewCmd("sudo chown -R gitlab-runner:gitlab-runner build/package").Run()
if err != nil {
return err
}
}

err := env.EnsureEnvVars(env.BuildVersion)
if err != nil {
return err
Expand Down Expand Up @@ -232,19 +222,10 @@ func PackageAndroidProvider() error {
})
logconfig.Bootstrap()

if err := sh.RunV("bin/package_android_provider", "amd64"); err != nil {
if err := sh.RunV("bin/package_android_docker", "provider"); err != nil {
return err
}

// Artifacts created by xgo (docker) on CI environment are owned by root.
// Chown package folder so we can create a POM (see below) in it.
if _, isCI := os.LookupEnv("CI"); isCI {
err := shell.NewCmd("sudo chown -R gitlab-runner:gitlab-runner build/package").Run()
if err != nil {
return err
}
}

err := env.EnsureEnvVars(env.BuildVersion)
if err != nil {
return err
Expand Down
26 changes: 16 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/mysteriumnetwork/node

go 1.26
go 1.26.10

require (
github.com/BurntSushi/toml v1.3.2
Expand Down Expand Up @@ -63,10 +63,10 @@ require (
github.com/vcraescu/go-paginator v0.0.0-20200304054438-86d84f27c0b3
github.com/xtaci/kcp-go/v5 v5.6.1
go.etcd.io/bbolt v1.3.5
golang.org/x/crypto v0.48.0
golang.org/x/net v0.50.0
golang.org/x/crypto v0.50.0
golang.org/x/net v0.53.0
golang.org/x/oauth2 v0.30.0
golang.org/x/sys v0.41.0
golang.org/x/sys v0.43.0
golang.org/x/time v0.12.0
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20211230205640-daad0b7ba671
Expand Down Expand Up @@ -257,12 +257,13 @@ require (
golang.org/x/arch v0.5.0 // indirect
golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476 // indirect
golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
golang.org/x/mod v0.32.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 // indirect
golang.org/x/text v0.34.0 // indirect
golang.org/x/tools v0.41.0 // indirect
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
golang.org/x/mobile v0.0.0-20260410095206-2cfb76559b7b // indirect
golang.org/x/mod v0.35.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa // indirect
golang.org/x/text v0.36.0 // indirect
golang.org/x/tools v0.44.0 // indirect
golang.org/x/tools/godoc v0.1.0-deprecated // indirect
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
gopkg.in/intercom/intercom-go.v2 v2.0.0-20210504094731-2bd1af0ce4b2 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
Expand All @@ -273,3 +274,8 @@ require (
)

replace golang.zx2c4.com/wireguard => github.com/mysteriumnetwork/wireguard-go v0.0.0-20240416113031-406b13e8996a

tool (
golang.org/x/mobile/cmd/gobind
golang.org/x/mobile/cmd/gomobile
)
Loading
Loading