diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 47d4bafc0dff4c5ca9d132e578308efdbd8c2663..777b103725e77b2a5620dee0dda99a7305a76445 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -162,22 +162,19 @@ jobs:
name: android_logs_manager_${{ github.event.pull_request.head.sha }}
path: deploy/logs.7z
- - name: Prepare artifacts for deploy
- run: python ./deploy/prepare_deployment.py android_manager
-
- name: Upload generic artifacts
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
if: ${{ matrix.task == 'assembleRelease' }}
with:
name: android_manager_${{ github.event.pull_request.head.sha }}
- path: deploy/android_manager.7z
+ path: android/BOINC/app/build/outputs/apk/release/app-release-unsigned.apk
- name: Upload armv6 only manager
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
if: ${{ matrix.task == 'assembleArmv6_release' }}
with:
name: android_armv6_manager_${{ github.event.pull_request.head.sha }}
- path: deploy/android_manager_armv6.7z
+ path: android/BOINC/app/build/outputs/apk/armv6_release/app-armv6_release-unsigned.apk
- name: Upload JUnit Tests Results
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
@@ -255,12 +252,12 @@ jobs:
path: deploy/logs.7z
- name: Prepare artifacts for deploy
- if: ${{ success() && ! contains(matrix.type, 'libs') }}
+ if: ${{ success() && matrix.type == 'apps' }}
run: python ./deploy/prepare_deployment.py android_${{ matrix.type }}
- name: Upload generic artifacts
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
- if: ${{ ! contains(matrix.type, 'libs') }}
+ if: ${{ success() && matrix.type == 'apps' }}
with:
name: android_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
path: deploy/android_${{ matrix.type }}.7z
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index 633849536e51809cdd33d0d54f274dd272374d18..50c15f28b43750d5099cff5d2d2858a6519ed491 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -148,13 +148,9 @@ jobs:
snap: ${{ matrix.snap_file }}
release: beta
- - name: Prepare artifacts for deploy
- if: success()
- run: python ./deploy/prepare_deployment.py linux_snap
-
- name: Upload artifacts
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
if: success()
with:
name: linux_snap_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
- path: deploy/linux_snap.7z
+ path: boinc_*.snap
diff --git a/deploy/prepare_deployment.py b/deploy/prepare_deployment.py
index 402ceeff6fc72090de7c810bcc1ae927ac7f6af7..b9d672efa5cbf67ef8a36b9fc04121d4d4ad5532 100644
--- a/deploy/prepare_deployment.py
+++ b/deploy/prepare_deployment.py
@@ -1,6 +1,6 @@
# This file is part of BOINC.
-# http://boinc.berkeley.edu
-# Copyright (C) 2024 University of California
+# https://boinc.berkeley.edu
+# Copyright (C) 2025 University of California
#
# BOINC is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License
@@ -81,16 +81,6 @@ mingw_apps_vcpkg_list = [
'./samples/docker_wrapper/docker_wrapper.exe',
]
-android_manager_generic_list = [
- './android/BOINC/app/build/outputs/apk/debug/app-debug.apk',
- './android/BOINC/app/build/outputs/apk/release/app-release-unsigned.apk'
-]
-
-android_manager_armv6_list = [
- './android/BOINC/app/build/outputs/apk/armv6_debug/app-armv6_debug.apk',
- './android/BOINC/app/build/outputs/apk/armv6_release/app-armv6_release-unsigned.apk'
-]
-
android_apps_list = [
# boinc_gahp
'./samples/condor/android_armv6_boinc_gahp',
@@ -240,10 +230,6 @@ wasm_client_debug_folder_list = [
'client/boinc_client.wasm',
]
-snap_list = [
- './boinc_*.snap',
-]
-
macos_manager_list = [
'mac_build/build/Deployment/AddRemoveUser',
'mac_build/build/Deployment/BOINC\ Installer.app',
@@ -355,20 +341,9 @@ def prepare_win_apps_mingw(target_directory):
def prepare_win_apps_mingw_vcpkg(target_directory):
prepare_7z_archive('win_apps-mingw-vcpkg', target_directory, mingw_apps_vcpkg_list)
-def prepare_android_manager(target_directory):
- prepare_7z_archive('android_manager', target_directory, android_manager_generic_list)
- prepare_7z_archive('android_manager_armv6', target_directory, android_manager_armv6_list)
-
-def prepare_android_manager_vcpkg(target_directory):
- prepare_7z_archive('android_manager-vcpkg', target_directory, android_manager_generic_list)
- prepare_7z_archive('android_manager-vcpkg_armv6', target_directory, android_manager_armv6_list)
-
def prepare_android_apps(target_directory):
prepare_7z_archive('android_apps', target_directory, android_apps_list)
-def prepare_android_apps_vcpkg(target_directory):
- prepare_7z_archive('android_apps-vcpkg', target_directory, android_apps_list)
-
def prepare_win_apps(target_directory):
prepare_7z_archive('win_apps', target_directory, windows_apps_list)
@@ -387,9 +362,6 @@ def prepare_wasm_client(target_directory):
def prepare_wasm_client_debug(target_directory):
prepare_7z_archive('wasm_client-debug', target_directory, wasm_client_debug_folder_list)
-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)
@@ -414,17 +386,13 @@ boinc_types = {
'linux_manager-without-webview': prepare_linux_manager_without_webview,
'win_apps-mingw': prepare_win_apps_mingw,
'win_apps-mingw-vcpkg': prepare_win_apps_mingw_vcpkg,
- 'android_manager': prepare_android_manager,
- 'android_manager-vcpkg': prepare_android_manager_vcpkg,
'android_apps': prepare_android_apps,
- 'android_apps-vcpkg': prepare_android_apps_vcpkg,
'win_apps': prepare_win_apps,
'win_client': prepare_win_client,
'win_manager': prepare_win_manager,
'win_installer': prepare_win_installer,
'wasm_client': prepare_wasm_client,
'wasm_client-debug': prepare_wasm_client_debug,
- 'linux_snap': prepare_linux_snap,
'macos_manager': prepare_macos_apps,
'macos_samples-makefile': prepare_macos_makefile_apps,
'logs': prepare_logs,