Merge pull request #75 from spacemeshos/include-missing-files-in-maco…

…s-build Include missing file in macOS build
spacemeshos · Nov 4, 2022 · 132b3a7 · 132b3a7
2 parents eda1279 + 75ba9ed
commit 132b3a7
Showing 1 changed file with 73 additions and 63 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,11 +10,11 @@ env:
 on:
   pull_request:
   push:
-    branches: [master]
+    branches: [develop]
 
 jobs:
   linux:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v3
@@ -50,17 +50,17 @@ jobs:
         run: build/test/gpu-setup-test -ic
 
       - name: Upload lib
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: linux
           path: build/src/libgpu-setup.so
       - name: Upload test-app
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: linux
           path: build/test/gpu-setup-test
       - name: Upload api.h
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: linux
           path: include/api.h
@@ -169,27 +169,27 @@ jobs:
         run: build/test/gpu-setup-test -ic
 
       - name: Upload DLL
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: windows
           path: build/src/gpu-setup.dll
       - name: Upload lib
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: windows
           path: build/src/gpu-setup.lib
       - name: Upload gnu lib
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: windows
           path: build/src/libgpu-setup.a
       - name: Upload test app
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: windows
           path: build/test/gpu-setup-test.exe
       - name: Upload api.h
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: windows
           path: include/api.h
@@ -262,22 +262,32 @@ jobs:
         run: build/test/gpu-setup-test -ic
 
       - name: Upload library
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: macos
           path: build/src/libgpu-setup.dylib
       - name: Upload test app
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: macos
           path: build/test/gpu-setup-test
       - name: Upload api.h
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: macos
           path: include/api.h
+      - name: Upload MoltenVK
+        uses: actions/upload-artifact@v3
+        with:
+          name: macos
+          path: ${{ env.VULKAN_ROOT_LOCATION }}/MoltenVK/dylib/macOS/libMoltenVK.dylib
+      - name: Upload MoltenVK config
+        uses: actions/upload-artifact@v3
+        with:
+          name: macos
+          path: ${{ env.VULKAN_ROOT_LOCATION }}/MoltenVK/dylib/macOS/MoltenVK_icd.json
       - name: Upload Vulkan
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: macos
           path: ${{ env.VULKAN_ROOT_LOCATION }}/macOS/lib/libvulkan.1.dylib
@@ -322,32 +332,32 @@ jobs:
         run: arch -arm64 build/test/gpu-setup-test -ic
 
       - name: Upload library
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: macos-m1
           path: build/src/libgpu-setup.dylib
       - name: Upload test app
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: macos-m1
           path: build/test/gpu-setup-test
       - name: Upload api.h
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: macos-m1
           path: include/api.h
       - name: Upload MoltenVK
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: macos-m1
           path: ${{ env.VULKAN_ROOT_LOCATION }}/MoltenVK/dylib/macOS/libMoltenVK.dylib
       - name: Upload MoltenVK config
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: macos-m1
           path: ${{ env.VULKAN_ROOT_LOCATION }}/MoltenVK/dylib/macOS/MoltenVK_icd.json
       - name: Upload Vulkan
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: macos-m1
           path: ${{ env.VULKAN_ROOT_LOCATION }}/macOS/lib/libvulkan.1.dylib
@@ -358,48 +368,48 @@ jobs:
   #   runs-on: [self-hosted, linux]
 
   #   steps:
-  #   - uses: actions/checkout@v3
-  #     with:
-  #       submodules: true
-
-  #   - run: cmake -DSPACEMESH_ARCH_ARM64=ON -B build
-  #   - run: cmake --build build
-
-  #   - name: Copy library
-  #     run: cp build/src/libgpu-setup.so build/test/libgpu-setup.so
-
-  #   - name: Unit tests - Golden vectors
-  #     run: build/test/gpu-setup-test --test-vector-check
-  #   - name: Unit tests - hash and bitstream
-  #     run: build/test/gpu-setup-test --unit-tests
-  #   - name: Unit tests - PoW
-  #     run: build/test/gpu-setup-test -tp -d 18 -id 0xe26b543725490682675f6f84ea7689601adeaf14caa7024ec1140c82754ca339 --salt 0x165310acce39719148915c356f25c5cb78e82203222cccdf3c15a9c3684e08cb -si 126202
-  #   - name: Unit tests - PoW and Leafs
-  #     run: build/test/gpu-setup-test -tlp -d 18 -id 0xe26b543725490682675f6f84ea7689601adeaf14caa7024ec1140c82754ca339 --salt 0x165310acce39719148915c356f25c5cb78e82203222cccdf3c15a9c3684e08cb -si 126202
-  #   - name: Unit tests - label lengths
-  #     run: build/test/gpu-setup-test -il
-  #   - name: Unit tests - labels count
-  #     run: build/test/gpu-setup-test -in
-  #   - name: Integration tests - concurrency test
-  #     run: build/test/gpu-setup-test -ip
-  #   - name: Integration tests - cancellation test
-  #     run: build/test/gpu-setup-test -ic
-
-  #   - name: Upload lib
-  #     uses: actions/upload-artifact@v2
-  #     with:
-  #       name: linux-arm64
-  #       path: build/src/libgpu-setup.so
-  #   - name: Upload test-app
-  #     uses: actions/upload-artifact@v2
-  #     with:
-  #       name: linux-arm64
-  #       path: build/test/gpu-setup-test
-  #   - name: Upload api.h
-  #     uses: actions/upload-artifact@v2
-  #     with:
-  #       name: linux-arm64
-  #       path: include/api.h
+  #     - uses: actions/checkout@v3
+  #       with:
+  #         submodules: true
+
+  #     - run: cmake -DSPACEMESH_ARCH_ARM64=ON -B build
+  #     - run: cmake --build build
+
+  #     - name: Copy library
+  #       run: cp build/src/libgpu-setup.so build/test/libgpu-setup.so
+
+  #     - name: Unit tests - Golden vectors
+  #       run: build/test/gpu-setup-test --test-vector-check
+  #     - name: Unit tests - hash and bitstream
+  #       run: build/test/gpu-setup-test --unit-tests
+  #     - name: Unit tests - PoW
+  #       run: build/test/gpu-setup-test -tp -d 18 -id 0xe26b543725490682675f6f84ea7689601adeaf14caa7024ec1140c82754ca339 --salt 0x165310acce39719148915c356f25c5cb78e82203222cccdf3c15a9c3684e08cb -si 126202
+  #     - name: Unit tests - PoW and Leafs
+  #       run: build/test/gpu-setup-test -tlp -d 18 -id 0xe26b543725490682675f6f84ea7689601adeaf14caa7024ec1140c82754ca339 --salt 0x165310acce39719148915c356f25c5cb78e82203222cccdf3c15a9c3684e08cb -si 126202
+  #     - name: Unit tests - label lengths
+  #       run: build/test/gpu-setup-test -il
+  #     - name: Unit tests - labels count
+  #       run: build/test/gpu-setup-test -in
+  #     - name: Integration tests - concurrency test
+  #       run: build/test/gpu-setup-test -ip
+  #     - name: Integration tests - cancellation test
+  #       run: build/test/gpu-setup-test -ic
+
+  #     - name: Upload lib
+  #       uses: actions/upload-artifact@v3
+  #       with:
+  #         name: linux-arm64
+  #         path: build/src/libgpu-setup.so
+  #     - name: Upload test-app
+  #       uses: actions/upload-artifact@v3
+  #       with:
+  #         name: linux-arm64
+  #         path: build/test/gpu-setup-test
+  #     - name: Upload api.h
+  #       uses: actions/upload-artifact@v3
+  #       with:
+  #         name: linux-arm64
+  #         path: include/api.h
 
   release:
     runs-on: ubuntu-latest
@@ -436,6 +446,6 @@ jobs:
             libgpu-setup-windows-${{ env.VERSION }}.zip
             libgpu-setup-macos-${{ env.VERSION }}.zip
             libgpu-setup-macos-m1-${{ env.VERSION }}.zip
-          #  libgpu-setup-linux-arm64-${{ env.VERSION }}.zip
+          # libgpu-setup-linux-arm64-${{ env.VERSION }}.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}