Forráskód Böngészése

update fast_float to 6.1.4 & update android CI (#4962)

* update fast_float to 6.1.4 & update android CI

* format
c8ef 11 hónapja
szülő
commit
e167e3a9cc

+ 9 - 10
.github/workflows/android.yml

@@ -12,27 +12,27 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         arch: [armeabi-v7a, arm64-v8a]
-        ndk: ["r22", "r26b"]
-        ndk_sdkver: ["29", "21"]
+        ndk: ["r22", "r27"]
+        ndk_sdkver: ["21", "30"]
 
     runs-on: ${{ matrix.os }}
 
     concurrency:
-        group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Android-${{ matrix.arch }}-${{ matrix.ndk }}-${{ matrix.ndk_sdkver }}
-        cancel-in-progress: true
+      group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Android-${{ matrix.arch }}-${{ matrix.ndk }}-${{ matrix.ndk_sdkver }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@v1
       - uses: xmake-io/github-action-setup-xmake@v1
         with:
           xmake-version: branch@master
-          actions-cache-folder: '.xmake-cache'
-          actions-cache-key: 'android'
+          actions-cache-folder: ".xmake-cache"
+          actions-cache-key: "android"
 
       - name: Prepare
         run: |
-          if test ${{ matrix.ndk }} = "r26b"; then
-            wget -q https://dl.google.com/android/repository/android-ndk-r26b-linux.zip
-            unzip -q -o ./android-ndk-r26b-linux.zip
+          if test ${{ matrix.ndk }} = "r27"; then
+            wget -q https://dl.google.com/android/repository/android-ndk-r27-linux.zip
+            unzip -q -o ./android-ndk-r27-linux.zip
           else
             wget -q https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip
             unzip -q -o ./android-ndk-r22-linux-x86_64.zip
@@ -41,4 +41,3 @@ jobs:
       - name: Tests
         run: |
           xmake l ./scripts/test.lua -D -p android --ndk=`pwd`/android-ndk-${{ matrix.ndk }} --ndk_sdkver=${{ matrix.ndk_sdkver }} -a ${{ matrix.arch }}
-

+ 7 - 8
.github/workflows/android_windows.yml

@@ -12,12 +12,12 @@ jobs:
       fail-fast: false
       matrix:
         arch: [armeabi-v7a, arm64-v8a]
-        ndk: ["r22", "r26c"]
-        ndk_sdkver: ["29"]
+        ndk: ["r22", "r27"]
+        ndk_sdkver: ["30"]
 
     concurrency:
-        group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Android-Windows-${{ matrix.arch }}-${{ matrix.ndk }}-${{ matrix.ndk_sdkver }}
-        cancel-in-progress: true
+      group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Android-Windows-${{ matrix.arch }}-${{ matrix.ndk }}-${{ matrix.ndk_sdkver }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@v1
       - uses: xmake-io/github-action-setup-xmake@v1
@@ -33,9 +33,9 @@ jobs:
 
       - name: Prepare
         run: |
-          if ("${{ matrix.ndk }}" -eq "r26c") {
-            curl -fsSL "https://dl.google.com/android/repository/android-ndk-r26c-windows.zip" -o android-ndk-r26c-windows.zip
-            Expand-Archive ./android-ndk-r26c-windows.zip -DestinationPath ./ndk
+          if ("${{ matrix.ndk }}" -eq "r27") {
+            curl -fsSL "https://dl.google.com/android/repository/android-ndk-r27-windows.zip" -o android-ndk-r27-windows.zip
+            Expand-Archive ./android-ndk-r27-windows.zip -DestinationPath ./ndk
           } else {
             curl -fsSL "https://dl.google.com/android/repository/android-ndk-r22-windows-x86_64.zip" -o android-ndk-r22-windows-x86_64.zip
             Expand-Archive ./android-ndk-r22-windows-x86_64.zip -DestinationPath ./ndk
@@ -55,4 +55,3 @@ jobs:
           Set-Item -Path Env:Path -Value ($Env:XMAKE_PROGRAM_DIR + ";" + $Env:Path)
           xmake --version
           xmake l ./scripts/test.lua -D -p android --ndk=D:/a/xmake-repo/xmake-repo/ndk/android-ndk-${{ matrix.ndk }} --ndk_sdkver=${{ matrix.ndk_sdkver }} -a ${{ matrix.arch }}
-

+ 3 - 2
packages/f/fast_float/xmake.lua

@@ -15,6 +15,7 @@ package("fast_float")
     add_versions("v6.1.0", "a9c8ca8ca7d68c2dbb134434044f9c66cfd4c383d5e85c36b704d30f6be82506")
     add_versions("v6.1.1", "10159a4a58ba95fe9389c3c97fe7de9a543622aa0dcc12dd9356d755e9a94cb4")
     add_versions("v6.1.3", "7dd99cc2ff44e07dc2a42bed0c6b8c4a8ee4e3b1c330f77073b6cfdb48724c8e")
+    add_versions("v6.1.4", "12cb6d250824160ca16bcb9d51f0ca7693d0d10cb444f34f1093bc02acfce704")
 
     if is_plat("wasm") then
         add_patches("v3.4.0", path.join(os.scriptdir(), "patches", "emscripten_fix.patch"), "482705431f67e6f0a375ed7bfe87d6856e7d13f071db6157e1d5659834b0eb50")
@@ -29,9 +30,9 @@ package("fast_float")
     on_test(function (package)
         assert(package:check_cxxsnippets({test = [[
             void test() {
-                const std::string input =  "3.1416 xyz ";
+                const std::string input = "3.1416 xyz ";
                 double result;
-                auto answer = fast_float::from_chars(input.data(), input.data()+input.size(), result);
+                auto answer = fast_float::from_chars(input.data(), input.data() + input.size(), result);
             }
         ]]}, {configs = {languages = "c++14"}, includes = {"fast_float/fast_float.h"}}))
     end)