From b5cc412c7cd39b2cbcde9ba89ae04e6a91ba455f Mon Sep 17 00:00:00 2001 From: leleliu008 Date: Fri, 18 Oct 2024 16:54:03 +0800 Subject: [PATCH] optimized --- .github/workflows/ubuntu.yml | 4 +--- ndk-pkg | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 7b644a8..e4fd063 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - version: [20.04, 22.04] + version: [24.04, 22.04, 20.04] container: ubuntu:${{ matrix.version }} @@ -68,8 +68,6 @@ jobs: - run: ./ndk-pkg install libzip -y - - - run: ./ndk-pkg info-installed libzip --prefix - run: ./ndk-pkg info-installed libzip --files - run: ./ndk-pkg info-installed libzip version diff --git a/ndk-pkg b/ndk-pkg index 32f712c..e26b677 100755 --- a/ndk-pkg +++ b/ndk-pkg @@ -5647,7 +5647,7 @@ $DOT_CONTENT if [ "$NATIVE_PLATFORM_TYPE" = macos ] ; then T="macos-${NATIVE_PLATFORM_VERS%%.*}.0-$NATIVE_PLATFORM_ARCH" else - T="$NATIVE_PLATFORM_SPEC" + T="linux-$NATIVE_PLATFORM_LIBC-$NATIVE_PLATFORM_ARCH" fi NON_RELOCATEABLE_BINARY_PACKAGE_NAME="non-relocatable-binary-packages-2024.10.12-$T"