From 1653f56ede2b0f4e15ed46ee643cf8b9df1f6e9c Mon Sep 17 00:00:00 2001 From: Matthias <5011972+fasmat@users.noreply.github.com> Date: Thu, 3 Nov 2022 16:23:14 +0000 Subject: [PATCH 01/12] Include missing file in macOS build --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d1f634..2cba10a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -276,6 +276,11 @@ jobs: with: name: macos path: include/api.h + - name: Upload MoltenVK + uses: actions/upload-artifact@v2 + with: + name: macos + path: ${{ env.VULKAN_ROOT_LOCATION }}/MoltenVK/dylib/macOS/libMoltenVK.dylib - name: Upload Vulkan uses: actions/upload-artifact@v2 with: From b20ed02574fab30f6eabb35b7058881ee155b614 Mon Sep 17 00:00:00 2001 From: Matthias <5011972+fasmat@users.noreply.github.com> Date: Thu, 3 Nov 2022 16:59:36 +0000 Subject: [PATCH 02/12] Use develop instead of master branch --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2cba10a..820c78b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ env: on: pull_request: push: - branches: [master] + branches: [develop] jobs: linux: From c57f2c049b06ca6e5fe2148ba0ec113c6bd0e45a Mon Sep 17 00:00:00 2001 From: Matthias <5011972+fasmat@users.noreply.github.com> Date: Thu, 3 Nov 2022 18:58:40 +0000 Subject: [PATCH 03/12] Remove dummy build step --- .github/workflows/build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 820c78b..0db46e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -295,9 +295,6 @@ jobs: with: submodules: true - - name: Setup env - run: echo "VULKAN_ROOT_LOCATION=$VULKAN_ROOT_LOCATION" >> $GITHUB_ENV - - name: Vulkan Info run: vulkaninfo From e78302e0dbe9292ace6953e90862fb3e2369243d Mon Sep 17 00:00:00 2001 From: Matthias <5011972+fasmat@users.noreply.github.com> Date: Thu, 3 Nov 2022 21:28:18 +0000 Subject: [PATCH 04/12] Use environment to access env variables --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0db46e6..bcca11e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -289,6 +289,8 @@ jobs: macos-m1: runs-on: [self-hosted, macos] + environment: + name: m1-self-hosted steps: - uses: actions/checkout@v3 From 6bb6da38b5c5ed46d9a3f0b14b335024326a5c64 Mon Sep 17 00:00:00 2001 From: Matthias <5011972+fasmat@users.noreply.github.com> Date: Thu, 3 Nov 2022 22:24:50 +0000 Subject: [PATCH 05/12] Activate linux-arm64 job --- .github/workflows/build.yml | 103 +++++++++++++++++------------------- 1 file changed, 50 insertions(+), 53 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bcca11e..b3332b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -356,59 +356,56 @@ jobs: name: macos-m1 path: ${{ env.VULKAN_ROOT_LOCATION }}/macOS/lib/libvulkan.1.dylib - # Temporarily disabled until linux arm64 VM becomes available again - # - # linux-arm64: - # 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 + linux-arm64: + 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 release: runs-on: ubuntu-latest - # needs: [linux, windows, macos, macos-m1, linux-arm64] - needs: [linux, windows, macos, macos-m1] + needs: [linux, windows, macos, macos-m1, linux-arm64] env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} if: startsWith(github.ref, 'refs/tags/v') @@ -428,8 +425,8 @@ jobs: run: zip --junk-paths libgpu-setup-macos-${{ env.VERSION }}.zip macos/* - name: Archive MacOS-M1 Library run: zip --junk-paths libgpu-setup-macos-m1-${{ env.VERSION }}.zip macos-m1/* - # - name: Archive Linux ARM64 Library - # run: zip --junk-paths libgpu-setup-linux-arm64-${{ env.VERSION }}.zip linux-arm64/* + - name: Archive Linux ARM64 Library + run: zip --junk-paths libgpu-setup-linux-arm64-${{ env.VERSION }}.zip linux-arm64/* - name: Release uses: softprops/action-gh-release@v1 @@ -440,6 +437,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 }} From 2afacb1620660d19c029fa32584033102d0527a2 Mon Sep 17 00:00:00 2001 From: Matthias <5011972+fasmat@users.noreply.github.com> Date: Thu, 3 Nov 2022 22:28:05 +0000 Subject: [PATCH 06/12] Remove environment from macos-m1 --- .github/workflows/build.yml | 86 ++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 44 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b3332b1..ef053dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -289,8 +289,6 @@ jobs: macos-m1: runs-on: [self-hosted, macos] - environment: - name: m1-self-hosted steps: - uses: actions/checkout@v3 @@ -360,48 +358,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@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 release: runs-on: ubuntu-latest From d04d12256e01f6eb655996551ac08ddee48e92d5 Mon Sep 17 00:00:00 2001 From: Matthias <5011972+fasmat@users.noreply.github.com> Date: Fri, 4 Nov 2022 08:45:34 +0000 Subject: [PATCH 07/12] Add step back to set VULKAN_ROOT_LOCATION --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef053dd..650a2f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -295,6 +295,9 @@ jobs: with: submodules: true + - name: Setup env + run: echo "VULKAN_ROOT_LOCATION=$VULKAN_ROOT_LOCATION" >> $GITHUB_ENV + - name: Vulkan Info run: vulkaninfo From ae4ca49e466b3033f538b664f31657a66623d04d Mon Sep 17 00:00:00 2001 From: Matthias <5011972+fasmat@users.noreply.github.com> Date: Fri, 4 Nov 2022 08:47:26 +0000 Subject: [PATCH 08/12] Disable arm64 linux again --- .github/workflows/build.yml | 100 ++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 650a2f7..cb43e76 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -357,52 +357,54 @@ jobs: name: macos-m1 path: ${{ env.VULKAN_ROOT_LOCATION }}/macOS/lib/libvulkan.1.dylib - linux-arm64: - 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 + # Temporarily disabled until linux arm64 VM becomes available again + # + # linux-arm64: + # 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 release: runs-on: ubuntu-latest @@ -426,8 +428,8 @@ jobs: run: zip --junk-paths libgpu-setup-macos-${{ env.VERSION }}.zip macos/* - name: Archive MacOS-M1 Library run: zip --junk-paths libgpu-setup-macos-m1-${{ env.VERSION }}.zip macos-m1/* - - name: Archive Linux ARM64 Library - run: zip --junk-paths libgpu-setup-linux-arm64-${{ env.VERSION }}.zip linux-arm64/* + # - name: Archive Linux ARM64 Library + # run: zip --junk-paths libgpu-setup-linux-arm64-${{ env.VERSION }}.zip linux-arm64/* - name: Release uses: softprops/action-gh-release@v1 @@ -438,6 +440,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 }} From e1177471a9a8b2b9b1746f4a6aacbf77dbbc518a Mon Sep 17 00:00:00 2001 From: Matthias <5011972+fasmat@users.noreply.github.com> Date: Fri, 4 Nov 2022 09:01:37 +0000 Subject: [PATCH 09/12] Remove need for linux-arm64 --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cb43e76..79de119 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -408,7 +408,8 @@ jobs: release: runs-on: ubuntu-latest - needs: [linux, windows, macos, macos-m1, linux-arm64] + # needs: [linux, windows, macos, macos-m1, linux-arm64] + needs: [linux, windows, macos, macos-m1] env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} if: startsWith(github.ref, 'refs/tags/v') From 053423f62d5bcecf5f477602d62dc5d96c058713 Mon Sep 17 00:00:00 2001 From: Matthias <5011972+fasmat@users.noreply.github.com> Date: Fri, 4 Nov 2022 09:12:24 +0000 Subject: [PATCH 10/12] Use ubuntu 20.04 to build linux version of library --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79de119..e195c92 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ on: jobs: linux: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 From 63d6ccab1342da0793f6f0e8be5c53c3b3c3177e Mon Sep 17 00:00:00 2001 From: Matthias <5011972+fasmat@users.noreply.github.com> Date: Fri, 4 Nov 2022 09:21:41 +0000 Subject: [PATCH 11/12] Use actions/upload-artifact@v3 instead of v2 --- .github/workflows/build.yml | 44 ++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e195c92..20f5616 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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,27 +262,27 @@ 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@v2 + uses: actions/upload-artifact@v3 with: name: macos path: ${{ env.VULKAN_ROOT_LOCATION }}/MoltenVK/dylib/macOS/libMoltenVK.dylib - 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 @@ -327,32 +327,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 @@ -391,17 +391,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-arm64 # path: build/src/libgpu-setup.so # - name: Upload test-app - # uses: actions/upload-artifact@v2 + # uses: actions/upload-artifact@v3 # with: # name: linux-arm64 # path: build/test/gpu-setup-test # - name: Upload api.h - # uses: actions/upload-artifact@v2 + # uses: actions/upload-artifact@v3 # with: # name: linux-arm64 # path: include/api.h From 75ba9ed08f8bd9085f3eab7a03f2a1b71ee02620 Mon Sep 17 00:00:00 2001 From: Matthias <5011972+fasmat@users.noreply.github.com> Date: Fri, 4 Nov 2022 11:24:23 +0000 Subject: [PATCH 12/12] Add missing MoltenVK_icd.json to macos build --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20f5616..03f6942 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -281,6 +281,11 @@ jobs: 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@v3 with: