mirror of
https://github.com/vcmi/vcmi.git
synced 2025-07-13 01:20:34 +02:00
Merge pull request #3547 from Alexander-Wilms/macos-cpack-workaround
Add second workaround for CPack issue on macOS
This commit is contained in:
14
.github/workflows/github.yml
vendored
14
.github/workflows/github.yml
vendored
@ -268,18 +268,26 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
ctest --preset ${{matrix.preset}}
|
ctest --preset ${{matrix.preset}}
|
||||||
|
|
||||||
|
- name: Kill XProtect to work around CPack issue on macOS
|
||||||
|
if: ${{ startsWith(matrix.platform, 'mac') }}
|
||||||
|
run: |
|
||||||
|
# Cf. https://github.com/actions/runner-images/issues/7522#issuecomment-1556766641
|
||||||
|
echo Killing...; sudo pkill -9 XProtect >/dev/null || true;
|
||||||
|
echo "Waiting..."; counter=0; while pgrep XProtect && ((counter < 20)); do sleep 3; ((counter++)); done
|
||||||
|
pgrep XProtect || true
|
||||||
|
|
||||||
- name: Pack
|
- name: Pack
|
||||||
id: cpack
|
id: cpack
|
||||||
if: ${{ matrix.pack == 1 }}
|
if: ${{ matrix.pack == 1 }}
|
||||||
run: |
|
run: |
|
||||||
cd '${{github.workspace}}/out/build/${{matrix.preset}}'
|
cd '${{github.workspace}}/out/build/${{matrix.preset}}'
|
||||||
CPACK_PATH=`which -a cpack | grep -m1 -v -i chocolatey`
|
CPACK_PATH=`which -a cpack | grep -m1 -v -i chocolatey`
|
||||||
"$CPACK_PATH" -C ${{matrix.pack_type}} ${{ matrix.cpack_args }}
|
counter=0; until "$CPACK_PATH" -C ${{matrix.pack_type}} ${{ matrix.cpack_args }} || ((counter > 20)); do sleep 3; ((counter++)); done
|
||||||
test -f '${{github.workspace}}/CI/${{matrix.platform}}/post_pack.sh' \
|
test -f '${{github.workspace}}/CI/${{matrix.platform}}/post_pack.sh' \
|
||||||
&& '${{github.workspace}}/CI/${{matrix.platform}}/post_pack.sh' '${{github.workspace}}' "$(ls '${{ env.VCMI_PACKAGE_FILE_NAME }}'.*)"
|
&& '${{github.workspace}}/CI/${{matrix.platform}}/post_pack.sh' '${{github.workspace}}' "$(ls '${{ env.VCMI_PACKAGE_FILE_NAME }}'.*)"
|
||||||
rm -rf _CPack_Packages
|
rm -rf _CPack_Packages
|
||||||
|
|
||||||
- name: Create android package
|
- name: Create Android package
|
||||||
if: ${{ startsWith(matrix.platform, 'android') }}
|
if: ${{ startsWith(matrix.platform, 'android') }}
|
||||||
run: |
|
run: |
|
||||||
cd android
|
cd android
|
||||||
@ -414,7 +422,7 @@ jobs:
|
|||||||
name: Android JNI android-64
|
name: Android JNI android-64
|
||||||
path: ${{ github.workspace }}/android/vcmi-app/src/main/jniLibs/
|
path: ${{ github.workspace }}/android/vcmi-app/src/main/jniLibs/
|
||||||
|
|
||||||
- name: Create android package
|
- name: Create Android package
|
||||||
run: |
|
run: |
|
||||||
cd android
|
cd android
|
||||||
./gradlew bundleRelease --info
|
./gradlew bundleRelease --info
|
||||||
|
Reference in New Issue
Block a user