blueloveTH 2 лет назад
Родитель
Сommit
0b888c00d3
1 измененных файлов с 7 добавлено и 7 удалено
  1. 7 7
      .github/workflows/dylib.yml

+ 7 - 7
.github/workflows/dylib.yml

@@ -10,8 +10,7 @@ jobs:
     - name: Install xmake
       shell: bash
       run: |
-        choco install wget
-        wget https://xmake.io/shget.text -O - | bash
+        winget install xmake
         xmake --version
     - name: Compile
       shell: bash
@@ -39,12 +38,13 @@ jobs:
         xmake f -p linux -a x86_64
         xmake
         cp build/linux/x86_64/release/libtest.so ../output/linux/x86_64
-    - name: Install android sdk
-      uses: android-actions/setup-android@v2
+    - uses: android-actions/setup-android@v2
     - uses: nttld/setup-ndk@v1
+      id: setup-ndk
       with:
         ndk-version: r25b
         add-to-path: false
+        local-cache: true
     - name: Compile android
       run: |
         mkdir -p output/android/armeabi-v7a
@@ -56,8 +56,8 @@ jobs:
         xmake f -p android -a arm64-v8a --ndk=$ANDROID_NDK_HOME
         xmake
         cp build/android/arm64-v8a/libtest.so ../output/android/arm64-v8a
-      - env:
-          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
+      env:
+        ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
     - uses: actions/upload-artifact@v3
       with:
         path: output
@@ -77,7 +77,7 @@ jobs:
           cd dylib
           xmake f -p macosx -a x86_64
           xmake
-          cp build/macosx/x86_64/libtest.dylib ../output/macos/x86_64
+          cp build/macosx/x86_64/release/libtest.dylib ../output/macos/x86_64
       - uses: actions/upload-artifact@v3
         with:
           path: output