Skip to content

Commit

Permalink
Merge branch 'master' of github.com:BOINC/boinc
Browse files Browse the repository at this point in the history
  • Loading branch information
davidpanderson committed Aug 12, 2024
2 parents 82b4c6b + 39559b5 commit f47abbe
Show file tree
Hide file tree
Showing 17 changed files with 110 additions and 100 deletions.
14 changes: 8 additions & 6 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
codecov:
require_ci_to_pass: yes
require_ci_to_pass: true
notify:
after_n_builds: 3
wait_for_ci: yes
token: ${{ secrets.CODECOV_TOKEN }}
wait_for_ci: true

coverage:
status:
Expand All @@ -15,13 +14,16 @@ coverage:
comment:
layout: "diff, files"
behavior: default
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]
require_changes: true # if true: only post the comment if coverage changes
require_base: false # [true :: must have a base report to post]
require_head: true # [true :: must have a head report to post]
branches:
- master
after_n_builds: 3

github_checks:
annotations: false

flags:
# filter the folder(s) you wish to measure by that flag
api:
Expand Down
25 changes: 11 additions & 14 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ jobs:

- name: Upload logs on failure
if: ${{ failure() }}
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
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@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: android_client_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
path: android/BOINC/app/src/main/assets/
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
path: android/BOINC/app/src/main/assets/

- name: Setup Java
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
with:
distribution: 'zulu'
java-version: "17"
Expand All @@ -151,7 +151,7 @@ jobs:

- name: Upload logs on failure
if: ${{ failure() }}
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: android_logs_manager_${{ github.event.pull_request.head.sha }}
path: deploy/logs.7z
Expand All @@ -160,41 +160,38 @@ jobs:
run: python ./deploy/prepare_deployment.py android_manager

- name: Upload generic artifacts
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
if: ${{ matrix.task == 'assembleRelease' }}
with:
name: android_manager_${{ github.event.pull_request.head.sha }}
path: deploy/android_manager.7z

- name: Upload xiaomi manager
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
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@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
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@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
if: ${{ always() && matrix.task == 'jacocoTestReportDebug' }}
with:
name: Android_tests_results
path: android/BOINC/app/build/test-results/testDebugUnitTest/TEST-*.xml

- name: Upload coverage report
if: ${{ matrix.task == 'jacocoTestReportDebug' }}
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
if: ${{ matrix.task == 'jacocoTestReportDebug' }}
with:
fail_ci_if_error: true
verbose: false

build:
name: ${{ matrix.type }}-build
Expand Down Expand Up @@ -247,7 +244,7 @@ jobs:

- name: Upload logs on failure
if: ${{ failure() }}
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: android_logs_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
path: deploy/logs.7z
Expand All @@ -257,7 +254,7 @@ jobs:
run: python ./deploy/prepare_deployment.py android_${{ matrix.type }}

- name: Upload generic artifacts
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
if: ${{ ! contains(matrix.type, 'libs') }}
with:
name: android_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/flutter-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:

- name: Setup Java
if: matrix.type == 'android'
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
with:
distribution: 'zulu'
java-version: '17'
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:

- name: Upload ${{ matrix.type }}
if: success()
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: ${{ matrix.type }}_flutter_${{ github.event.pull_request.head.sha }}
path: deploy/flutter_${{ matrix.type }}.7z
2 changes: 1 addition & 1 deletion .github/workflows/flutter-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
- name: Upload ${{ matrix.type }}
if: success()
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: ${{ matrix.type }}_flutter_${{ github.event.pull_request.head.sha }}
path: deploy/flutter_${{ matrix.type }}.7z
4 changes: 2 additions & 2 deletions .github/workflows/linux-package-stable-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
cd ${{ github.workspace }}/.github/workflows/debrepo/
./repo_update.sh "$ALLOW_CREATE" ${{ env.BASEREPO }} ${{ github.workspace }} ${{ matrix.os }} "stable" ${{ env.PUBKEY }}
- uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
- uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
if: ${{ success() && env.SKIP_RUN == 0 }}
with:
name: repo-stable-${{ matrix.os }}
Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:
# Updates or creates the repository
./repo_update.sh "$ALLOW_CREATE" ${{ env.BASEREPO }} ${CWD} ${{ matrix.os }} "stable" ${{ env.PUBKEY }} ${{ env.PUBKEY_HASH }} ${{ env.ARCH }}
- uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
- uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
if: ${{ success() && env.SKIP_RUN == 0 }}
with:
name: repo-stable-${{ matrix.os }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/linux-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:

- name: Upload logs on failure
if: ${{ failure() }}
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: linux-package_logs_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
path: deploy/logs.7z
Expand All @@ -118,7 +118,7 @@ jobs:
run: python3 ./deploy/prepare_deployment.py linux_${{ matrix.type }}

- name: Upload artifacts
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
if: success()
with:
name: linux-package_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
Expand Down Expand Up @@ -225,7 +225,7 @@ jobs:
dpkg-deb --info "${{ github.workspace }}/${PKG_FULL}.deb"
- name: Upload artifacts
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
if: success()
with:
name: linux-package_${{ matrix.type }}_${{ matrix.os }}_${{ github.event.pull_request.head.sha }}
Expand Down Expand Up @@ -592,7 +592,7 @@ jobs:
rpm -qp --qf '%|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{(none)}|}|\n' "RPMS/${{ env.ARCH }}/${PKG_FULL}.rpm"
- name: Upload artifacts
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
if: success()
with:
name: linux-package_${{ matrix.type }}_${{ matrix.os }}_${{ github.event.pull_request.head.sha }}
Expand Down Expand Up @@ -968,7 +968,7 @@ jobs:
cd ${{ github.workspace }}/.github/workflows/debrepo/
./repo_update.sh "$ALLOW_CREATE" ${{ env.BASEREPO }} ${{ github.workspace }} ${{ matrix.os }} ${{ env.RELEASE_TYPE }} ${{ env.PUBKEY }}
- uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
- uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
if: ${{ success() && env.SKIP_RUN == 0 }}
with:
name: repo-${{ env.RELEASE_TYPE }}-${{ matrix.os }}
Expand Down Expand Up @@ -1071,7 +1071,7 @@ jobs:
# Updates or creates the repository
./repo_update.sh "$ALLOW_CREATE" ${{ env.BASEREPO }} ${CWD} ${{ matrix.os }} ${{ env.RELEASE_TYPE }} ${{ env.PUBKEY }} ${{ env.PUBKEY_HASH }} ${{ env.ARCH }}
- uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
- uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
if: ${{ success() && env.SKIP_RUN == 0 }}
with:
name: repo-${{ env.RELEASE_TYPE }}-${{ matrix.os }}
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ jobs:

- name: Upload logs on failure
if: ${{ failure() }}
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: linux_logs_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
path: deploy/logs.7z
Expand All @@ -181,27 +181,24 @@ jobs:
run: python ./deploy/prepare_deployment.py linux_${{ matrix.type }}

- name: Upload artifacts
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
if: ${{ ! contains(matrix.type, 'libs') && ! contains(matrix.type, 'server') && ! contains(matrix.type, 'test') }}
with:
name: linux_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
path: deploy/linux_${{ matrix.type }}.7z

- name: Upload Google Tests Results
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
if: always() && matrix.type == 'unit-test' # run this step even if previous step failed
with:
name: Linux_tests_results
path: "tests/gtest/**/*_xml_report.xml"

- name: Upload coverage report
if: success() && matrix.type == 'unit-test'
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
if: success() && matrix.type == 'unit-test'
with:
fail_ci_if_error: true
verbose: false

build-release:
name: ${{ matrix.type }}-build-release
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:

- name: Upload logs on failure
if: ${{ failure() }}
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: mingw_logs_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
path: deploy/logs.7z
Expand All @@ -124,7 +124,7 @@ jobs:
run: python ./deploy/prepare_deployment.py win_${{ matrix.type }}

- name: Upload artifacts
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
if: ${{! contains(matrix.type, 'libs')}}
with:
name: win_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:

- name: Upload logs on failure
if: ${{ failure() }}
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: osx_logs_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
path: deploy/logs.7z
Expand All @@ -99,27 +99,27 @@ jobs:

- name: Upload manager
if: matrix.type == 'manager'
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: osx_manager_${{ github.event.pull_request.head.sha }}
path: deploy/macos_manager.7z

- name: Upload apps
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: osx_${{ matrix.type }}_apps_${{ github.event.pull_request.head.sha }}
path: deploy/macos_apps.7z

- name: Upload x86_64 apps
if: matrix.type == 'samples-makefile'
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: osx_x86_64_apps_${{ github.event.pull_request.head.sha }}
path: deploy/macos_apps_x86_64.7z

- name: Upload arm64 apps
if: matrix.type == 'samples-makefile'
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: osx_arm64_apps_${{ github.event.pull_request.head.sha }}
path: deploy/macos_apps_arm64.7z
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:

- name: Upload logs on failure
if: ${{ failure() }}
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: osx_logs_cmake-build_${{ github.event.pull_request.head.sha }}
path: deploy/logs.7z
4 changes: 2 additions & 2 deletions .github/workflows/snap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
- name: Upload logs on failure
if: ${{ failure() }}
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: snap_logs_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
path: deploy/logs.7z
Expand All @@ -125,7 +125,7 @@ jobs:
run: python ./deploy/prepare_deployment.py linux_snap

- name: Upload artifacts
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
if: success()
with:
name: linux_snap_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:

- name: Upload logs on failure
if: ${{ failure() }}
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: wasm_logs_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
path: deploy/logs.7z
Expand All @@ -113,7 +113,7 @@ jobs:
run: python ./deploy/prepare_deployment.py wasm_${{ matrix.type }}

- name: Upload artifacts
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
if: ${{ ! contains(matrix.type, 'libs') }}
with:
name: wasm_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
Expand Down
Loading

0 comments on commit f47abbe

Please sign in to comment.