From d3285d2d6d57f84d8bc805446b1833f1eb83b5e1 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Sat, 6 Jan 2024 18:08:26 +0100 Subject: [PATCH] [CI][OSX] Upload build artifacts Signed-off-by: Vitalii Koshura --- .github/workflows/osx.yml | 27 +++++++++++++++++ deploy/prepare_deployment.py | 58 ++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index 43ca6f49fea..cfd205eb2dd 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -127,3 +127,30 @@ jobs: with: name: osx_logs_cmake-build_${{ github.event.pull_request.head.sha }} path: deploy/logs.7z + + - name: Prepare artifacts for deploy + run: python ./deploy/prepare_deployment.py macos_apps + + - name: Upload manager + uses: actions/upload-artifact@v3 + with: + name: osx_manager_${{ github.event.pull_request.head.sha }} + path: deploy/macos_manager.7z + + - name: Upload apps + uses: actions/upload-artifact@v3 + with: + name: osx_apps_${{ github.event.pull_request.head.sha }} + path: deploy/macos_apps.7z + + - name: Upload x86_64 apps + uses: actions/upload-artifact@v3 + with: + name: osx_x86_64_apps_${{ github.event.pull_request.head.sha }} + path: deploy/macos_apps_x86_64.7z + + - name: Upload arm64 apps + uses: actions/upload-artifact@v3 + with: + name: osx_arm64_apps_${{ github.event.pull_request.head.sha }} + path: deploy/macos_apps_arm64.7z diff --git a/deploy/prepare_deployment.py b/deploy/prepare_deployment.py index fb09cea668e..7d214739bc0 100644 --- a/deploy/prepare_deployment.py +++ b/deploy/prepare_deployment.py @@ -223,6 +223,57 @@ './boinc_*.snap', ] +macos_manager_list = [ + 'mac_build/build/Deployment/AddRemoveUser', + 'mac_build/build/Deployment/BOINC Installer.app', + 'mac_build/build/Deployment/BOINCManager.app', + 'mac_build/build/Deployment/BOINCSaver.saver', + 'mac_build/build/Deployment/BOINC_Finish_Install.app', + 'mac_build/build/Deployment/PostInstall.app', + 'mac_build/build/Deployment/SetUpSecurity', + 'mac_build/build/Deployment/SetVersion', + 'mac_build/build/Deployment/Uninstall BOINC.app', + 'mac_build/build/Deployment/boinc', + 'mac_build/build/Deployment/boinccmd', + 'mac_build/build/Deployment/boincscr', + 'mac_build/build/Deployment/gfx_cleanup', + 'mac_build/build/Deployment/gfx_switcher', + 'mac_build/build/Deployment/setprojectgrp', + 'mac_build/build/Deployment/switcher', + 'mac_build/build/Deployment/detect_rosetta_cpu', +] + +macos_apps_list = [ + 'mac_build/build/Deployment/boinc_zip_test', + 'mac_build/build/Deployment/testzlibconflict', + 'mac_build/build/Deployment/UC2-apple-darwin', + 'mac_build/build/Deployment/UC2_graphics-apple-darwin', + 'mac_build/build/Deployment/slide_show-apple-darwin', + 'mac_build/build/Deployment/vboxwrapper', + 'samples/wrapper/wrapper', + 'samples/vboxwrapper/vboxwrapper', +] + +macos_apps_x86_64_list = [ + 'samples/example_app/x86_64/uc2', + 'samples/example_app/uc2_x86_64', + 'samples/example_app/x86_64/uc2_graphics', + 'samples/example_app/uc2_graphics_x86_64', + 'samples/example_app/x86_64/slide_show', + 'samples/example_app/slide_show_x86_64', + 'samples/openclapp/openclapp_x86_64', +] + +macos_apps_arm64_list = [ + 'samples/example_app/arm64/uc2', + 'samples/example_app/uc2_arm64', + 'samples/example_app/arm64/uc2_graphics', + 'samples/example_app/uc2_graphics_arm64', + 'samples/example_app/arm64/slide_show', + 'samples/example_app/slide_show_arm64', + 'samples/openclapp/openclapp_arm64', +] + logs_list = [ 'config.log', '3rdParty/wasm/vcpkg/buildtrees/*.log', @@ -313,6 +364,12 @@ def prepare_wasm_client_debug(target_directory): def prepare_linux_snap(target_directory): prepare_7z_archive('linux_snap', target_directory, snap_list) +def prepare_macos_apps(target_directory): + prepare_7z_archive('macos_manager', target_directory, macos_manager_list) + prepare_7z_archive('macos_apps', target_directory, macos_apps_list) + prepare_7z_archive('macos_apps_x86_64', target_directory, macos_apps_x86_64_list) + prepare_7z_archive('macos_apps_arm64', target_directory, macos_apps_arm64_list) + def prepare_logs(target_directory): prepare_7z_archive('logs', target_directory, logs_list) @@ -338,6 +395,7 @@ def prepare_logs(target_directory): 'wasm_client': prepare_wasm_client, 'wasm_client-debug': prepare_wasm_client_debug, 'linux_snap': prepare_linux_snap, + 'macos_apps': prepare_macos_apps, 'logs': prepare_logs, }