diff --git a/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/armv7 b/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/armv7 deleted file mode 100644 index 26ec1a9..0000000 --- a/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/armv7 +++ /dev/null @@ -1,4 +0,0 @@ -include(host) - -[settings] -arch=armv7 diff --git a/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/armv8 b/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/armv8 deleted file mode 100644 index 9ff2e06..0000000 --- a/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/armv8 +++ /dev/null @@ -1,4 +0,0 @@ -include(host) - -[settings] -arch=armv8 diff --git a/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/default b/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/default deleted file mode 100644 index c98940a..0000000 --- a/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/default +++ /dev/null @@ -1,8 +0,0 @@ -[settings] -arch=x86_64 -build_type=Release -compiler=apple-clang -compiler.cppstd=gnu17 -compiler.libcxx=libc++ -compiler.version=15 -os=Macos diff --git a/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/host b/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/host deleted file mode 100644 index 6274fb1..0000000 --- a/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/host +++ /dev/null @@ -1,13 +0,0 @@ -include(default) - -[settings] -os=Android -os.api_level=23 -arch=armv8 -compiler=clang -compiler.version=17 -compiler.libcxx=c++_static -compiler.cppstd=20 - -[conf] -tools.android:ndk_path=$ANDROID_HOME/ndk/26.3.11579264 diff --git a/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/x86 b/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/x86 deleted file mode 100644 index 77b3565..0000000 --- a/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/x86 +++ /dev/null @@ -1,4 +0,0 @@ -include(host) - -[settings] -arch=x86 diff --git a/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/x86_64 b/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/x86_64 deleted file mode 100644 index 7c1d9db..0000000 --- a/.github/config/macos-13-xlarge-ndk-26.3.11579264/conan/profiles/x86_64 +++ /dev/null @@ -1,4 +0,0 @@ -include(host) - -[settings] -arch=x86_64 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 557b97c..b60f823 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,7 +54,6 @@ jobs: # - { os: ubuntu-22.04, compiler: ndk-26.3.11579264, host-profile: armv7 } # - { os: ubuntu-22.04, compiler: ndk-26.3.11579264, host-profile: x86 } # - { os: macos-13, compiler: ndk-26.3.11579264, host-profile: armv8 } - - { os: macos-13-xlarge, compiler: ndk-26.3.11579264, host-profile: armv8 } # - { os: macos-13, compiler: ndk-26.3.11579264, host-profile: x86_64 } # - { os: macos-13, compiler: ndk-26.3.11579264, host-profile: armv7 } # - { os: macos-13, compiler: ndk-26.3.11579264, host-profile: x86 } @@ -76,10 +75,6 @@ jobs: uses: android-actions/setup-android@v3 with: packages: 'ndk;26.3.11579264' - - run: ls $ANDROID_HOME/ndk/26.3.11579264/toolchains/llvm/prebuilt - if: matrix.config.os == 'macos-13-xlarge' - - run: ls $ANDROID_HOME/ndk/26.3.11579264/toolchains/llvm/prebuilt/*/bin - if: matrix.config.os == 'macos-13-xlarge' - name: expand ANDROID_HOME env var in conan profile if: startsWith(matrix.config.compiler, 'ndk-')