Merge branch 'BOINC:master' into Vulpine05-4916

.codecov.yml

@@ -17,7 +17,7 @@ comment:
   require_changes: yes    # if true: only post the comment if coverage changes
   require_base: no        # [yes :: must have a base report to post]
   require_head: yes       # [yes :: must have a head report to post]
-  branches: 
+  branches:
     - master
   after_n_builds: 3
 

.github/workflows/all_projects_list_xml_update.yml

@@ -0,0 +1,58 @@
+# This file is part of BOINC.
+# http://boinc.berkeley.edu
+# Copyright (C) 2023 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
+# as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+#
+# BOINC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+
+name: all_projects_list.xml Update
+on:
+  schedule:
+    - cron:  '0 0 * * 0'
+
+jobs:
+  build:
+    if: github.repository == 'BOINC/boinc'
+    name: ${{ matrix.type }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        type: [all_projects_list_xml_update]
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+      - name: Download latest all_projects_list.xml
+        if: success()
+        run: |
+          curl https://boinc.berkeley.edu/project_list.php --output ./win_build/installerv2/redist/all_projects_list.xml
+      - name: Check file was updated
+        if: success()
+        run: |
+          set +e
+          git diff --exit-code
+          echo "PR_REQUIRED=$?" >> $GITHUB_ENV
+      - name: Create PR
+        if: ${{ success() &&  env.PR_REQUIRED == 1 }}
+        uses: peter-evans/create-pull-request@v5
+        with:
+          commit-message: Update all_projects_list.xml
+          title: Update all_projects_list.xml
+          body: |
+            This PR was automatically created by a GitHub Action.
+          branch: all_projects_list_xml_update
+          base: master
+          delete-branch: true
+          add-paths: |
+            win_build/installerv2/redist/all_projects_list.xml

.github/workflows/android.yml

@@ -1,11 +1,29 @@
+# This file is part of BOINC.
+# http://boinc.berkeley.edu
+# Copyright (C) 2023 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
+# as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+#
+# BOINC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+
 name: Android
 on:
   push:
     branches: [ master, 'client_release/**' ]
+    tags: [ 'client_release/**' ]
   pull_request:
     branches: [ master ]
   schedule:
-    - cron:  '5 12 * * 0'
+    - cron:  '0 0 * * 0'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -17,18 +35,104 @@ env:
   AWS_DEFAULT_REGION: us-west-2
 
 jobs:
-  build:
-    name: ${{ matrix.type }}-build
-    runs-on: ubuntu-20.04
+  build-client:
+    name: client-${{ matrix.type }}-build
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        type: [manager, libs, apps, manager-vcpkg, libs-vcpkg, apps-vcpkg, libs-cmake]
+        type: [armv6, arm, arm64, x86, x86_64]
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 2
 
+      - name: Install dependencies
+        run: |
+          sudo add-apt-repository universe
+          sudo apt-get -qq update
+          sudo apt-get install -y libncurses5
+
+      - name: Check if build is running from origin repo
+        if: ${{ success() && env.AWS_ACCESS_KEY_ID != 0 && env.AWS_SECRET_ACCESS_KEY != 0 }}
+        run: |
+          echo "VCPKG_BINARY_SOURCES=clear;x-aws,s3://vcpkg.cache.boinc/,readwrite" >> $GITHUB_ENV
+
+      - name: Check if build is running from fork
+        if: ${{ success() && (env.AWS_ACCESS_KEY_ID == 0 || env.AWS_SECRET_ACCESS_KEY == 0) }}
+        run: |
+          echo "VCPKG_BINARY_SOURCES=clear;x-aws-config,no-sign-request;x-aws,s3://vcpkg.cache.boinc/,read" >> $GITHUB_ENV
+
+      - name: Unset ANDROID_NDK_ROOT environment variable
+        if: ${{ success() }}
+        run: |
+          echo ANDROID_NDK_ROOT="" >> $GITHUB_ENV
+
+      - name: Build client with vcpkg
+        if: ${{ success() }}
+        run: ./android/ci_build_vcpkg_client.sh --arch ${{ matrix.type }}
+
+      - name: Prepare logs on failure
+        if: ${{ failure() }}
+        run: python ./deploy/prepare_deployment.py logs
+
+      - name: Upload logs on failure
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: android_logs_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
+          path: deploy/logs.7z
+
+      - name: Upload client on success
+        if: ${{ success() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: android_client_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
+          path: android/BOINC/app/src/main/assets/
+
+  build-manager:
+    name: manager-build
+    runs-on: ubuntu-latest
+    needs: build-client
+    strategy:
+      matrix:
+        task: [assembleRelease, assembleXiaomi_release, assembleArmv6_release, jacocoTestReportDebug]
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+
+      - name: Download armv6 client
+        uses: actions/download-artifact@v3
+        with:
+          name: android_client_armv6_${{ github.event.pull_request.head.sha }}
+          path: android/BOINC/app/src/main/assets/
+
+      - name: Download arm client
+        uses: actions/download-artifact@v3
+        with:
+          name: android_client_arm_${{ github.event.pull_request.head.sha }}
+          path: android/BOINC/app/src/main/assets/
+
+      - name: Download arm64 client
+        uses: actions/download-artifact@v3
+        with:
+          name: android_client_arm64_${{ github.event.pull_request.head.sha }}
+          path: android/BOINC/app/src/main/assets/
+
+      - name: Download x86 client
+        uses: actions/download-artifact@v3
+        with:
+          name: android_client_x86_${{ github.event.pull_request.head.sha }}
+          path: android/BOINC/app/src/main/assets/
+
+      - name: Download x86_64 client
+        uses: actions/download-artifact@v3
+        with:
+          name: android_client_x86_64_${{ github.event.pull_request.head.sha }}
+          path: android/BOINC/app/src/main/assets/
+
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
@@ -38,13 +142,75 @@ jobs:
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
 
-      - name: Cache dependencies
-        uses: actions/cache@v3
+      - name: Build manager with vcpkg
+        run: ./android/ci_build_vcpkg_manager.sh --skip-client-build --tasks "clean ${{ matrix.task }}"
+
+      - name: Prepare logs on failure
+        if: ${{ failure() }}
+        run: python ./deploy/prepare_deployment.py logs
+
+      - name: Upload logs on failure
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v3
+        with:
+          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@v3
+        if: ${{ matrix.task == 'assembleRelease' }}
         with:
-          path: |
-            3rdParty/buildCache
-            !3rdParty/buildCache/android/vcpkgcache/
-          key: android-${{ matrix.type }}-${{ hashFiles('android/*.sh', '.github/workflows/android.yml') }}
+          name: android_manager_${{ github.event.pull_request.head.sha }}
+          path: deploy/android_manager.7z
+
+      - name: Upload xiaomi manager
+        uses: actions/upload-artifact@v3
+        if: ${{ matrix.task == 'assembleXiaomi_release' }}
+        with:
+          name: android_xiaomi_manager_${{ github.event.pull_request.head.sha }}
+          path: deploy/android_manager_xiaomi.7z
+
+      - name: Upload armv6 only manager
+        uses: actions/upload-artifact@v3
+        if: ${{ matrix.task == 'assembleArmv6_release' }}
+        with:
+          name: android_armv6_manager_${{ github.event.pull_request.head.sha }}
+          path: deploy/android_manager_armv6.7z
+
+      - name: Upload JUnit Tests Results
+        uses: actions/upload-artifact@v3
+        if: ${{ always() && matrix.task == 'jacocoTestReportDebug' }}
+        with:
+          name: Android_tests_results
+          path: android/BOINC/app/build/test-results/testDebugUnitTest/TEST-*.xml
+
+      - name: Upload coverage report
+        uses: codecov/codecov-action@v3
+        if: ${{ matrix.task == 'jacocoTestReportDebug' }}
+        with:
+          fail_ci_if_error: true
+          verbose: false
+
+  build:
+    name: ${{ matrix.type }}-build
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        type: [libs, apps, libs-cmake]
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+
+      - name: Install dependencies
+        run: |
+          sudo add-apt-repository universe
+          sudo apt-get -qq update
+          sudo apt-get install -y libncurses5
 
       - name: Check if build is running from origin repo
         if: ${{ success() && env.AWS_ACCESS_KEY_ID != 0 && env.AWS_SECRET_ACCESS_KEY != 0 }}
@@ -61,29 +227,12 @@ jobs:
         run: |
           echo ANDROID_NDK_ROOT="" >> $GITHUB_ENV
 
-      - name: Build manager
-        if: ${{ success() && matrix.type == 'manager' }}
-        run:  |
-          ./android/ci_build_manager.sh
-
-      - name: Build libs
-        if: ${{ success() && matrix.type == 'libs' }}
-        run: ./android/ci_build_libraries.sh
-
-      - name: Build apps
-        if: ${{ success() && matrix.type == 'apps' }}
-        run: ./android/ci_build_apps.sh
-
-      - name: Build manager with vcpkg
-        if: ${{ success() && matrix.type == 'manager-vcpkg' }}
-        run: ./android/ci_build_vcpkg_manager.sh
-
       - name: Build libs with vcpkg
-        if: ${{ success() && matrix.type == 'libs-vcpkg' }}
+        if: ${{ success() && matrix.type == 'libs' }}
         run: ./android/ci_build_vcpkg_libraries.sh
 
       - name: Build apps with vcpkg
-        if: ${{ success() && matrix.type == 'apps-vcpkg' }}
+        if: ${{ success() && matrix.type == 'apps' }}
         run: ./android/ci_build_vcpkg_apps.sh
 
       - name: Build libs with cmake
@@ -111,29 +260,3 @@ jobs:
         with:
           name: android_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
           path: deploy/android_${{ matrix.type }}.7z
-      - name: Upload xiaomi manager
-        uses: actions/upload-artifact@v3
-        if: ${{ contains(matrix.type, 'manager') }}
-        with:
-          name: android_xiaomi_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
-          path: deploy/android_${{ matrix.type }}_xiaomi.7z
-      - name: Upload armv6 only manager
-        uses: actions/upload-artifact@v3
-        if: ${{ contains(matrix.type, 'manager') }}
-        with:
-          name: android_armv6_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
-          path: deploy/android_${{ matrix.type }}_armv6.7z
-
-      - name: Upload JUnit Tests Results
-        uses: actions/upload-artifact@v3
-        if: always() && matrix.type == 'manager'      # run this step even if previous step failed
-        with:
-          name: Android_tests_results
-          path: android/BOINC/app/build/test-results/testDebugUnitTest/TEST-*.xml
-
-      - name: Upload coverage report
-        uses: codecov/codecov-action@v3
-        if: ${{ success() && matrix.type == 'manager' }}
-        with:
-          fail_ci_if_error: true
-          verbose: false

.github/workflows/coverity.yml

@@ -1,7 +1,24 @@
+# This file is part of BOINC.
+# http://boinc.berkeley.edu
+# Copyright (C) 2023 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
+# as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+#
+# BOINC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+
 name: Coverity
 on:
   schedule:
-    - cron:  '30 12 * * 0'
+    - cron:  '0 0 * * 0'
 
 jobs:
   coverity:
@@ -15,9 +32,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu bionic main universe'
           sudo apt-get -qq update
-          sudo apt-get install -y libftgl-dev freeglut3-dev libcurl4-openssl-dev libxmu-dev libxi-dev libfcgi-dev libxss-dev libnotify-dev libxcb-util0-dev libgtk2.0-dev libwebkitgtk-dev p7zip-full libxxf86vm-dev ocl-icd-opencl-dev zip
+          sudo apt-get install -y libftgl-dev freeglut3-dev libcurl4-openssl-dev libxmu-dev libxi-dev libfcgi-dev libxss-dev libnotify-dev libxcb-util0-dev libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev libwebkit2gtk-4.0-dev p7zip-full libxxf86vm-dev ocl-icd-opencl-dev zip
 
       - name: Cache dependencies
         uses: actions/cache@v3