[PR #6] [MERGED] build: isolate Amnezia mobile packaging from upstream #6

New issue

Closed

opened 2026-10-13 20:01:16 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-13 20:01:16 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-box/pull/6
Author: @FrogRocky
Created: 9/10/2026
Status: ✅ Merged
Merged: 9/10/2026
Merged by: @FrogRocky

Base: dev ← Head: codex/upstream-build-isolation

📝 Commits (1)

118b540 build: isolate Amnezia mobile packaging from upstream

📊 Changes

11 files changed (+394 additions, -430 deletions)

View changed files

📝 .github/workflows/amnezia-ci.yml (+1 -1)
📝 Makefile (+1 -1)
📝 Makefile.amnezia (+5 -5)
➕ cmd/internal/build_amnezia_libbox/main.go (+134 -0)
➕ cmd/internal/build_amnezia_libbox/main_integration_test.go (+124 -0)
📝 cmd/internal/build_amnezia_libbox/main_test.go (+42 -12)
📝 cmd/internal/build_libbox/main.go (+54 -170)
➖ cmd/internal/build_libbox/main_integration_test.go (+0 -232)
📝 docs/amnezia/build.md (+10 -4)
📝 docs/amnezia/maintenance.md (+22 -4)
📝 include/registry.go (+1 -1)

📄 Description

Amnezia mobile packaging currently modifies the upstream build_libbox command, which makes upstream updates harder to merge. Restore that command and the inherited Makefile to the selected v1.12.12 baseline, and route Makefile.amnezia through a separate small builder using the unchanged SDK/mobile discovery helpers. The wrapper retains its version, output, platform, debug and Tailscale options; the separate builder has no sibling-client copy stage.

Remove the redundant import alias and document one logical commit or squash for ordinary changes, with regular merges for upstream synchronization and release branches. Shared-file changes against the baseline fall from 14 files (+413/-260 lines) to 12 (+241/-204). Upstream profile and API adaptation remains part of future synchronization.

Validation: focused Go race/integration tests and vet; wrapper CLI build with AWG; real Android AAR with all four ABIs; real Apple XCFramework for iOS, tvOS and macOS; module consistency, actionlint and exact baseline-file comparison. Hosted CI validates the PR merge and both independent consumers before merge.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/amnezia-vpn/amnezia-box/pull/6 **Author:** [@FrogRocky](https://github.com/FrogRocky) **Created:** 9/10/2026 **Status:** ✅ Merged **Merged:** 9/10/2026 **Merged by:** [@FrogRocky](https://github.com/FrogRocky) **Base:** `dev` ← **Head:** `codex/upstream-build-isolation` --- ### 📝 Commits (1) - [`118b540`](https://github.com/amnezia-vpn/amnezia-box/commit/118b5401af2b9abd25008c75fcf7f94c38383e80) build: isolate Amnezia mobile packaging from upstream ### 📊 Changes **11 files changed** (+394 additions, -430 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/amnezia-ci.yml` (+1 -1) 📝 `Makefile` (+1 -1) 📝 `Makefile.amnezia` (+5 -5) ➕ `cmd/internal/build_amnezia_libbox/main.go` (+134 -0) ➕ `cmd/internal/build_amnezia_libbox/main_integration_test.go` (+124 -0) 📝 `cmd/internal/build_amnezia_libbox/main_test.go` (+42 -12) 📝 `cmd/internal/build_libbox/main.go` (+54 -170) ➖ `cmd/internal/build_libbox/main_integration_test.go` (+0 -232) 📝 `docs/amnezia/build.md` (+10 -4) 📝 `docs/amnezia/maintenance.md` (+22 -4) 📝 `include/registry.go` (+1 -1) </details> ### 📄 Description Amnezia mobile packaging currently modifies the upstream `build_libbox` command, which makes upstream updates harder to merge. Restore that command and the inherited Makefile to the selected v1.12.12 baseline, and route `Makefile.amnezia` through a separate small builder using the unchanged SDK/mobile discovery helpers. The wrapper retains its version, output, platform, debug and Tailscale options; the separate builder has no sibling-client copy stage. Remove the redundant import alias and document one logical commit or squash for ordinary changes, with regular merges for upstream synchronization and release branches. Shared-file changes against the baseline fall from 14 files (+413/-260 lines) to 12 (+241/-204). Upstream profile and API adaptation remains part of future synchronization. Validation: focused Go race/integration tests and vet; wrapper CLI build with AWG; real Android AAR with all four ABIs; real Apple XCFramework for iOS, tvOS and macOS; module consistency, actionlint and exact baseline-file comparison. Hosted CI validates the PR merge and both independent consumers before merge. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

bsakaguchi

2026-10-13 20:01:16 +00:00

closed this issue
added the
pull-request
label

No labels

pull-request

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

amnezia-vpn/amnezia-box#6

No description provided.

Rows
Columns