diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2021-04-15 17:25:35 +0300 |
|---|---|---|
| committer | Hannah von Reth <hannah.vonreth@owncloud.com> | 2021-04-15 17:25:35 +0300 |
| commit | 3754b12fcfc6f28e3e72ded0902f9bf18a9b59af (patch) | |
| tree | 98ff1a10e22436844d194e50286751f54eac0689 /.github | |
| parent | d9a9d2105e5c5ae0eaf2127c135289c434ab411c (diff) | |
| parent | 4dda87e9ec7748d4f143891a251468ef23450cd2 (diff) | |
Merge remote-tracking branch 'origin/2.8' into master
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/.sonar.ps1 | 3 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/.github/workflows/.sonar.ps1 b/.github/workflows/.sonar.ps1 index 411c9b081..a7c865cb1 100644 --- a/.github/workflows/.sonar.ps1 +++ b/.github/workflows/.sonar.ps1 @@ -24,7 +24,8 @@ if ($args[0] -eq "--build") { "sonar.host.url=https://sonarcloud.io", "sonar.exclusions=docs/**,man/**,translations/**,admin/**,test/**,src/3rdparty/qtokenizer/test/**", "sonar.cfamily.threads=$env:NUMBER_OF_PROCESSORS", - "sonar.cfamily.cache.enabled=false") + "sonar.cfamily.cache.enabled=true", + "sonar.cfamily.cache.path=${HOME}/cache/sonarcloud") for($i = 0; $i -lt $defines.Length; $i++) { $defines[$i] = ("-D{0}" -f $defines[$i]) } diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 04574b049..c48569bdb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,11 +38,19 @@ jobs: fetch-depth: ${{ matrix.fetch-depth }} submodules: true + - name: Restore cache + uses: actions/cache@v2 + with: + path: ~/cache + key: ${{ runner.os }}-${{ matrix.target }} + - name: Clone CraftMaster run: git clone --depth=1 https://invent.kde.org/kde/craftmaster.git "$env:HOME/craft/CraftMaster/CraftMaster" - name: Craft setup - run: ${{ github.workspace }}/.github/workflows/.craft.ps1 --setup + run: | + New-Item -Path ~/cache -ItemType Directory -ErrorAction SilentlyContinue + ${{ github.workspace }}/.github/workflows/.craft.ps1 --setup - name: Craft unshelve run: ${{ github.workspace }}/.github/workflows/.craft.ps1 -c --unshelve "${{ github.workspace }}/.craft.shelf" |