Skip to content

Commit

Permalink
give up on caching android; tweak qt dir
Browse files Browse the repository at this point in the history
  • Loading branch information
lambdcalculus committed Nov 29, 2023
1 parent 94bee25 commit b0f6465
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,6 @@ jobs:
with:
python-version: '3.10'

- name: actions/cache android
if: matrix.platform == 'android'
uses: actions/cache@master
id: cache
with:
path: |
${{ env.ANDROID_HOME }}/ndk/21.4.7075529
${{ env.ANDROID_HOME }}/platforms/android-24
key: android-24-21.4.7075529

- name: Add msbuild to PATH
if: matrix.platform == 'msvc2019'
uses: microsoft/setup-msbuild@main
Expand Down Expand Up @@ -97,7 +87,7 @@ jobs:
- name: Add tools to PATH (MinGW)
if: matrix.platform == 'mingw81_32'
shell: bash
run: echo "$RUNNER_WORKSPACE/Qt/Tools/mingw810_32/bin" >> $GITHUB_PATH
run: echo "${Qt5_DIR}/../../Tools/mingw810_32/bin" >> $GITHUB_PATH

- name: Configure MSVC (Windows)
if: contains(matrix.platform, 'msvc')
Expand Down Expand Up @@ -262,9 +252,9 @@ jobs:
working-directory: ${{github.workspace}}/bin/
shell: bash
run: |
cp $RUNNER_WORKSPACE/Qt/Tools/mingw810_32/bin/libgcc_s_dw2-1.dll .
cp $RUNNER_WORKSPACE/Qt/Tools/mingw810_32/bin/libstdc++-6.dll .
cp $RUNNER_WORKSPACE/Qt/Tools/mingw810_32/bin/libwinpthread-1.dll .
cp ${Qt5_DIR}/../../Tools/mingw810_32/bin/libgcc_s_dw2-1.dll .
cp ${Qt5_DIR}/../../Tools/mingw810_32/bin/libstdc++-6.dll .
cp ${Qt5_DIR}/../../Tools/mingw810_32/bin/libwinpthread-1.dll .
- name: Deploy Linux
if: matrix.platform == 'gcc_64'
Expand Down

0 comments on commit b0f6465

Please sign in to comment.