Skip to content

Commit

Permalink
CI: Android Caching Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Holden committed Jan 23, 2025
1 parent d829048 commit 802c87f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/actions/cache/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@ runs:
sudo make install
- name: Setup sccache (Windows)
if: runner.os == 'Windows'
if: runner.os == 'Windows' && inputs.target != 'android'
uses: mozilla-actions/[email protected]

- run: echo "SCCACHE_GHA_ENABLED=true" >> "$GITHUB_ENV"
if: runner.os == 'Windows'
if: runner.os == 'Windows' && inputs.target != 'android'
shell: bash

- name: Setup Build Cache
uses: hendrikmuhs/ccache-action@main
with:
create-symlink: ${{ runner.os != 'Windows' }}
variant: ${{ runner.os == 'Windows' && 'sccache' || 'ccache' }}
variant: ${{ runner.os == 'Windows' && inputs.target != 'android' && 'sccache' || 'ccache' }}
key: ${{ inputs.host }}-ccache-${{ inputs.target }}-${{ inputs.build-type }}
restore-keys: |
${{ inputs.host }}-ccache-${{ inputs.target }}
Expand All @@ -62,7 +62,7 @@ runs:
shell: bash

- name: Cache CPM Modules
if: (inputs.cpm-modules != '')
if: inputs.cpm-modules != ''
uses: actions/cache@v4
with:
path: ${{ inputs.cpm-modules }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/qt-android/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ runs:
uses: ./.github/actions/cache
with:
host: ${{ inputs.host }}
target: ${{ inputs.arch }}
target: android
build-type: ${{ matrix.BuildType }}
cpm-modules: ${{ inputs.cpm-cache }}

Expand Down

0 comments on commit 802c87f

Please sign in to comment.