Skip to content

Sync the engine with TaJirax/cottenDNS #4

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
TaJirax merged 1 commit into from
Aug 3, 2026
Merged

Sync the engine with TaJirax/cottenDNS #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 0 additions & 47 deletions .github/workflows/build-go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,29 +214,6 @@ jobs:
go_os: darwin
cgo_enabled: "0"
smoke_test: false
- os: ubuntu-22.04
platform: Termux
arch: arm64
ext: ""
package: tar.gz
go_arch: arm64
go_os: android
cgo_enabled: "0"
smoke_test: false
- os: ubuntu-22.04
platform: Termux
arch: armv7
ext: ""
package: tar.gz
go_arch: arm
go_arm: "7"
go_os: android
cgo_enabled: "1"
android_ndk: true
android_api: "21"
android_cc: armv7a-linux-androideabi21-clang
android_cxx: armv7a-linux-androideabi21-clang++
smoke_test: false

steps:
- name: Checkout repository
Expand All @@ -248,30 +225,6 @@ jobs:
go-version-file: go.mod
cache: true

- name: Set up Java 17 for Android builds
if: ${{ matrix.android_ndk }}
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: "17"

- name: Set up Android SDK
if: ${{ matrix.android_ndk }}
uses: android-actions/setup-android@v3

- name: Install Android NDK
if: ${{ matrix.android_ndk }}
shell: bash
run: |
set -euo pipefail
sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" "ndk;27.2.12479018"
NDK_ROOT="${ANDROID_SDK_ROOT}/ndk/27.2.12479018"
test -x "${NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.android_cc }}"
test -x "${NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.android_cxx }}"
echo "ANDROID_NDK_ROOT=${NDK_ROOT}" >> "$GITHUB_ENV"
echo "CC=${NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.android_cc }}" >> "$GITHUB_ENV"
echo "CXX=${NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.android_cxx }}" >> "$GITHUB_ENV"

- name: Install goversioninfo
if: ${{ matrix.go_os == 'windows' }}
run: |
Expand Down
47 changes: 0 additions & 47 deletions .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,29 +213,6 @@ jobs:
go_os: darwin
cgo_enabled: "0"
smoke_test: false
- os: ubuntu-22.04
platform: Termux
arch: arm64
ext: ""
package: tar.gz
go_arch: arm64
go_os: android
cgo_enabled: "0"
smoke_test: false
- os: ubuntu-22.04
platform: Termux
arch: armv7
ext: ""
package: tar.gz
go_arch: arm
go_arm: "7"
go_os: android
cgo_enabled: "1"
android_ndk: true
android_api: "21"
android_cc: armv7a-linux-androideabi21-clang
android_cxx: armv7a-linux-androideabi21-clang++
smoke_test: false

steps:
- name: Checkout repository
Expand All @@ -247,30 +224,6 @@ jobs:
go-version-file: go.mod
cache: true

- name: Set up Java 17 for Android builds
if: ${{ matrix.android_ndk }}
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: "17"

- name: Set up Android SDK
if: ${{ matrix.android_ndk }}
uses: android-actions/setup-android@v3

- name: Install Android NDK
if: ${{ matrix.android_ndk }}
shell: bash
run: |
set -euo pipefail
sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" "ndk;27.2.12479018"
NDK_ROOT="${ANDROID_SDK_ROOT}/ndk/27.2.12479018"
test -x "${NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.android_cc }}"
test -x "${NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.android_cxx }}"
echo "ANDROID_NDK_ROOT=${NDK_ROOT}" >> "$GITHUB_ENV"
echo "CC=${NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.android_cc }}" >> "$GITHUB_ENV"
echo "CXX=${NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.android_cxx }}" >> "$GITHUB_ENV"

- name: Install goversioninfo
if: ${{ matrix.go_os == 'windows' }}
run: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/go-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,9 @@ jobs:
android-engine:
runs-on: ubuntu-latest

# Android-source contract: this repo is checked out at a pinned commit and
# built as the WhiteDNS Android app's native engine. Cross-compile all four
# Android-source contract: this repo is consumed as a pinned source snapshot by the
# WhiteDNS Android app, which builds the native engine itself from this
# source — no Android artifact is released here. Cross-compile all four
# ABIs through scripts/build-android-client.sh on every push so main can never
# silently stop being a valid Android engine source. Uses the NDK preinstalled
# on the runner rather than downloading a pinned one — this validates the build
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ logs/
*.tmp
*.exe
build/
dist/
.gocache/
.gocache-audit/
.bench/
Expand All @@ -35,3 +36,6 @@ cmd/*/resource_windows_*.syso
.gochache/
.android-build-audit/
.tmp-android-engine-upstream/

# Local engineering audit (human-readable, intentionally not committed)
reports/cottendns-network-engineering-audit.html
Loading
Loading