Skip to content

Commit

Permalink
CI: Fix CPM_Modules Caching
Browse files Browse the repository at this point in the history
  • Loading branch information
HTRamsey committed Feb 9, 2025
1 parent 60260a5 commit 248fa2d
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/actions/cache/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ inputs:
cpm-modules:
description: Path to CPM Modules
required: false
default: $GITHUB_WORKSPACE/cpm-modules
default: $RUNNER_TEMP/shadow_build_dir/cpm-modules
ccache-version:
description: ccache Version to Install
required: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
QT_ANDROID_ABIS: ${{ matrix.BuildType == 'Release' && 'armeabi-v7a;arm64-v8a' || 'arm64-v8a' }}
CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules
CPM_SOURCE_CACHE: ${{ runner.temp }}/shadow_build_dir/cpm_modules

steps:
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
QT_ANDROID_ABIS: 'arm64-v8a'
CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules
CPM_SOURCE_CACHE: ${{ runner.temp }}/shadow_build_dir/cpm_modules

steps:
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
QT_ANDROID_ABIS: 'arm64-v8a'
CPM_SOURCE_CACHE: ${{ github.workspace }}\cpm_modules
CPM_SOURCE_CACHE: ${{ runner.temp }}\shadow_build_dir\cpm_modules

steps:
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/custom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
ARTIFACT: QGroundControl-installer.exe
QT_VERSION: 6.8.1
GST_VERSION: 1.22.12
CPM_SOURCE_CACHE: ${{ github.workspace }}\cpm_modules
CPM_SOURCE_CACHE: ${{ runner.temp }}\shadow_build_dir\cpm_modules

steps:
- name: Checkout repo
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/docs_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ on:
- 'v*'
paths:
- 'docs/**'
- 'package*.json'
pull_request:
paths:
- 'docs/**'

- 'package*.json'
workflow_dispatch:

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
PACKAGE: QGroundControl
QT_VERSION: 6.8.1
GST_VERSION: 1.22.12
CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules
CPM_SOURCE_CACHE: ${{ runner.temp }}/shadow_build_dir/cpm_modules

steps:
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
PACKAGE: QGroundControl-x86_64
QT_VERSION: 6.8.1
GST_VERSION: 1.22.12
CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules
CPM_SOURCE_CACHE: ${{ runner.temp }}/shadow_build_dir/cpm_modules

steps:
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
ARTIFACT: QGroundControl.dmg
PACKAGE: QGroundControl
QT_VERSION: 6.8.1
CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules
CPM_SOURCE_CACHE: ${{ runner.temp }}/shadow_build_dir/cpm_modules

steps:
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
PACKAGE: QGroundControl-installer
QT_VERSION: 6.8.1
GST_VERSION: 1.22.12
CPM_SOURCE_CACHE: ${{ github.workspace }}\cpm_modules
CPM_SOURCE_CACHE: ${{ runner.temp }}\shadow_build_dir\cpm_modules

steps:
- name: Checkout repo
Expand Down

0 comments on commit 248fa2d

Please sign in to comment.