Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linux-clang-compile-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:
cd build
useradd -m -s /bin/bash test
chown -R test:test .
su -c 'xvfb-run ctest --output-on-failure' test
su -c 'xvfb-run ctest --output-on-failure --parallel 4' test
2 changes: 1 addition & 1 deletion .github/workflows/linux-gcc-compile-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:
cd build
useradd -m -s /bin/bash test
chown -R test:test .
su -c 'xvfb-run ctest --output-on-failure' test
su -c 'xvfb-run ctest --output-on-failure --parallel 4' test
2 changes: 1 addition & 1 deletion .github/workflows/macos-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@ jobs:
- name: Run tests
run: |
cd ${{ github.workspace }}/${{ inputs.CRAFT_TARGET }}/build/nextcloud-client/work/build
ctest --output-on-failure --output-junit testResult.xml
ctest --output-on-failure --output-junit testResult.xml --parallel 4
27 changes: 2 additions & 25 deletions .github/workflows/windows-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ jobs:
runs-on: windows-2022
env:
CRAFT_TARGET: windows-msvc2022_64-cl
COBERTURA_COVERAGE_FILE: ${{ github.workspace }}\cobertura_coverage\coverage.xml
CRAFT_MASTER_LOCATION: ${{ github.workspace }}\CraftMaster
CRAFT_MASTER_CONFIG: ${{ github.workspace }}\craftmaster.ini
steps:
Expand All @@ -36,36 +35,14 @@ jobs:
craft craft
craft --install-deps nextcloud-client

- name: Cache Install OpenCppCoverage
id: cache-install-opencppcoverage
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: C:\Program Files\OpenCppCoverage
key: ${{ runner.os }}-cache-install-opencppcoverage

- name: Install OpenCppCoverage
if: steps.cache-install-opencppcoverage.outputs.cache-hit != 'true'
shell: pwsh
run: |
choco install opencppcoverage

#- name: Cache Install inkscape
# id: cache-install-inkscape
# uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
# with:
# path: C:\Program Files\inkscape
# key: ${{ runner.os }}-cache-install-inkscape

- name: Install inkscape
# if: steps.cache-install-inkscape.outputs.cache-hit != 'true'
shell: pwsh
run: |
choco install inkscape

- name: Setup PATH
shell: pwsh
run: |
echo "C:\Program Files\OpenCppCoverage" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo "${{ github.workspace }}\${{ env.CRAFT_TARGET }}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append

- name: Compile
Expand All @@ -78,7 +55,7 @@ jobs:

craft --src-dir ${{ github.workspace }} nextcloud-client

- name: Run tests with coverage
- name: Run tests
shell: pwsh
run: |
function runTests() {
Expand All @@ -88,7 +65,7 @@ jobs:

$binFolder = "$buildFolder\bin"

& ctest --output-on-failure --timeout 300
& ctest --output-on-failure --timeout 300 --parallel 4
}

runTests
Loading