Skip to content
This repository was archived by the owner on Apr 8, 2024. It is now read-only.

Commit 132b3a7

Browse files
fasmatfasmat
authored
Merge pull request #75 from spacemeshos/include-missing-files-in-macos-build
Include missing file in macOS build
2 parents eda1279 + 75ba9ed commit 132b3a7

File tree

1 file changed

+73
-63
lines changed

1 file changed

+73
-63
lines changed

‎.github/workflows/build.yml

+73-63
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ env:
1010
on:
1111
pull_request:
1212
push:
13-
branches: [master]
13+
branches: [develop]
1414

1515
jobs:
1616
linux:
17-
runs-on: ubuntu-22.04
17+
runs-on: ubuntu-20.04
1818

1919
steps:
2020
- uses: actions/checkout@v3
@@ -50,17 +50,17 @@ jobs:
5050
run: build/test/gpu-setup-test -ic
5151

5252
- name: Upload lib
53-
uses: actions/upload-artifact@v2
53+
uses: actions/upload-artifact@v3
5454
with:
5555
name: linux
5656
path: build/src/libgpu-setup.so
5757
- name: Upload test-app
58-
uses: actions/upload-artifact@v2
58+
uses: actions/upload-artifact@v3
5959
with:
6060
name: linux
6161
path: build/test/gpu-setup-test
6262
- name: Upload api.h
63-
uses: actions/upload-artifact@v2
63+
uses: actions/upload-artifact@v3
6464
with:
6565
name: linux
6666
path: include/api.h
@@ -169,27 +169,27 @@ jobs:
169169
run: build/test/gpu-setup-test -ic
170170

171171
- name: Upload DLL
172-
uses: actions/upload-artifact@v2
172+
uses: actions/upload-artifact@v3
173173
with:
174174
name: windows
175175
path: build/src/gpu-setup.dll
176176
- name: Upload lib
177-
uses: actions/upload-artifact@v2
177+
uses: actions/upload-artifact@v3
178178
with:
179179
name: windows
180180
path: build/src/gpu-setup.lib
181181
- name: Upload gnu lib
182-
uses: actions/upload-artifact@v2
182+
uses: actions/upload-artifact@v3
183183
with:
184184
name: windows
185185
path: build/src/libgpu-setup.a
186186
- name: Upload test app
187-
uses: actions/upload-artifact@v2
187+
uses: actions/upload-artifact@v3
188188
with:
189189
name: windows
190190
path: build/test/gpu-setup-test.exe
191191
- name: Upload api.h
192-
uses: actions/upload-artifact@v2
192+
uses: actions/upload-artifact@v3
193193
with:
194194
name: windows
195195
path: include/api.h
@@ -262,22 +262,32 @@ jobs:
262262
run: build/test/gpu-setup-test -ic
263263

264264
- name: Upload library
265-
uses: actions/upload-artifact@v2
265+
uses: actions/upload-artifact@v3
266266
with:
267267
name: macos
268268
path: build/src/libgpu-setup.dylib
269269
- name: Upload test app
270-
uses: actions/upload-artifact@v2
270+
uses: actions/upload-artifact@v3
271271
with:
272272
name: macos
273273
path: build/test/gpu-setup-test
274274
- name: Upload api.h
275-
uses: actions/upload-artifact@v2
275+
uses: actions/upload-artifact@v3
276276
with:
277277
name: macos
278278
path: include/api.h
279+
- name: Upload MoltenVK
280+
uses: actions/upload-artifact@v3
281+
with:
282+
name: macos
283+
path: ${{ env.VULKAN_ROOT_LOCATION }}/MoltenVK/dylib/macOS/libMoltenVK.dylib
284+
- name: Upload MoltenVK config
285+
uses: actions/upload-artifact@v3
286+
with:
287+
name: macos
288+
path: ${{ env.VULKAN_ROOT_LOCATION }}/MoltenVK/dylib/macOS/MoltenVK_icd.json
279289
- name: Upload Vulkan
280-
uses: actions/upload-artifact@v2
290+
uses: actions/upload-artifact@v3
281291
with:
282292
name: macos
283293
path: ${{ env.VULKAN_ROOT_LOCATION }}/macOS/lib/libvulkan.1.dylib
@@ -322,32 +332,32 @@ jobs:
322332
run: arch -arm64 build/test/gpu-setup-test -ic
323333

324334
- name: Upload library
325-
uses: actions/upload-artifact@v2
335+
uses: actions/upload-artifact@v3
326336
with:
327337
name: macos-m1
328338
path: build/src/libgpu-setup.dylib
329339
- name: Upload test app
330-
uses: actions/upload-artifact@v2
340+
uses: actions/upload-artifact@v3
331341
with:
332342
name: macos-m1
333343
path: build/test/gpu-setup-test
334344
- name: Upload api.h
335-
uses: actions/upload-artifact@v2
345+
uses: actions/upload-artifact@v3
336346
with:
337347
name: macos-m1
338348
path: include/api.h
339349
- name: Upload MoltenVK
340-
uses: actions/upload-artifact@v2
350+
uses: actions/upload-artifact@v3
341351
with:
342352
name: macos-m1
343353
path: ${{ env.VULKAN_ROOT_LOCATION }}/MoltenVK/dylib/macOS/libMoltenVK.dylib
344354
- name: Upload MoltenVK config
345-
uses: actions/upload-artifact@v2
355+
uses: actions/upload-artifact@v3
346356
with:
347357
name: macos-m1
348358
path: ${{ env.VULKAN_ROOT_LOCATION }}/MoltenVK/dylib/macOS/MoltenVK_icd.json
349359
- name: Upload Vulkan
350-
uses: actions/upload-artifact@v2
360+
uses: actions/upload-artifact@v3
351361
with:
352362
name: macos-m1
353363
path: ${{ env.VULKAN_ROOT_LOCATION }}/macOS/lib/libvulkan.1.dylib
@@ -358,48 +368,48 @@ jobs:
358368
# runs-on: [self-hosted, linux]
359369

360370
# steps:
361-
# - uses: actions/checkout@v3
362-
# with:
363-
# submodules: true
364-
365-
# - run: cmake -DSPACEMESH_ARCH_ARM64=ON -B build
366-
# - run: cmake --build build
367-
368-
# - name: Copy library
369-
# run: cp build/src/libgpu-setup.so build/test/libgpu-setup.so
370-
371-
# - name: Unit tests - Golden vectors
372-
# run: build/test/gpu-setup-test --test-vector-check
373-
# - name: Unit tests - hash and bitstream
374-
# run: build/test/gpu-setup-test --unit-tests
375-
# - name: Unit tests - PoW
376-
# run: build/test/gpu-setup-test -tp -d 18 -id 0xe26b543725490682675f6f84ea7689601adeaf14caa7024ec1140c82754ca339 --salt 0x165310acce39719148915c356f25c5cb78e82203222cccdf3c15a9c3684e08cb -si 126202
377-
# - name: Unit tests - PoW and Leafs
378-
# run: build/test/gpu-setup-test -tlp -d 18 -id 0xe26b543725490682675f6f84ea7689601adeaf14caa7024ec1140c82754ca339 --salt 0x165310acce39719148915c356f25c5cb78e82203222cccdf3c15a9c3684e08cb -si 126202
379-
# - name: Unit tests - label lengths
380-
# run: build/test/gpu-setup-test -il
381-
# - name: Unit tests - labels count
382-
# run: build/test/gpu-setup-test -in
383-
# - name: Integration tests - concurrency test
384-
# run: build/test/gpu-setup-test -ip
385-
# - name: Integration tests - cancellation test
386-
# run: build/test/gpu-setup-test -ic
387-
388-
# - name: Upload lib
389-
# uses: actions/upload-artifact@v2
390-
# with:
391-
# name: linux-arm64
392-
# path: build/src/libgpu-setup.so
393-
# - name: Upload test-app
394-
# uses: actions/upload-artifact@v2
395-
# with:
396-
# name: linux-arm64
397-
# path: build/test/gpu-setup-test
398-
# - name: Upload api.h
399-
# uses: actions/upload-artifact@v2
400-
# with:
401-
# name: linux-arm64
402-
# path: include/api.h
371+
# - uses: actions/checkout@v3
372+
# with:
373+
# submodules: true
374+
375+
# - run: cmake -DSPACEMESH_ARCH_ARM64=ON -B build
376+
# - run: cmake --build build
377+
378+
# - name: Copy library
379+
# run: cp build/src/libgpu-setup.so build/test/libgpu-setup.so
380+
381+
# - name: Unit tests - Golden vectors
382+
# run: build/test/gpu-setup-test --test-vector-check
383+
# - name: Unit tests - hash and bitstream
384+
# run: build/test/gpu-setup-test --unit-tests
385+
# - name: Unit tests - PoW
386+
# run: build/test/gpu-setup-test -tp -d 18 -id 0xe26b543725490682675f6f84ea7689601adeaf14caa7024ec1140c82754ca339 --salt 0x165310acce39719148915c356f25c5cb78e82203222cccdf3c15a9c3684e08cb -si 126202
387+
# - name: Unit tests - PoW and Leafs
388+
# run: build/test/gpu-setup-test -tlp -d 18 -id 0xe26b543725490682675f6f84ea7689601adeaf14caa7024ec1140c82754ca339 --salt 0x165310acce39719148915c356f25c5cb78e82203222cccdf3c15a9c3684e08cb -si 126202
389+
# - name: Unit tests - label lengths
390+
# run: build/test/gpu-setup-test -il
391+
# - name: Unit tests - labels count
392+
# run: build/test/gpu-setup-test -in
393+
# - name: Integration tests - concurrency test
394+
# run: build/test/gpu-setup-test -ip
395+
# - name: Integration tests - cancellation test
396+
# run: build/test/gpu-setup-test -ic
397+
398+
# - name: Upload lib
399+
# uses: actions/upload-artifact@v3
400+
# with:
401+
# name: linux-arm64
402+
# path: build/src/libgpu-setup.so
403+
# - name: Upload test-app
404+
# uses: actions/upload-artifact@v3
405+
# with:
406+
# name: linux-arm64
407+
# path: build/test/gpu-setup-test
408+
# - name: Upload api.h
409+
# uses: actions/upload-artifact@v3
410+
# with:
411+
# name: linux-arm64
412+
# path: include/api.h
403413

404414
release:
405415
runs-on: ubuntu-latest
@@ -436,6 +446,6 @@ jobs:
436446
libgpu-setup-windows-${{ env.VERSION }}.zip
437447
libgpu-setup-macos-${{ env.VERSION }}.zip
438448
libgpu-setup-macos-m1-${{ env.VERSION }}.zip
439-
# libgpu-setup-linux-arm64-${{ env.VERSION }}.zip
449+
# libgpu-setup-linux-arm64-${{ env.VERSION }}.zip
440450
env:
441451
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)