diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-11-18 20:09:53 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-11-19 17:18:33 -0800 |
| commit | 198096e30e6577e03fa27a2dd5046ba3009b5780 (patch) | |
| tree | 01446dea4c7b3ed5ef9569b98e29be4dc1d0e2f1 | |
| parent | 695950b15a3ab272032f7bd4829ba57044735a70 (diff) | |
| download | subsurface-198096e30e6577e03fa27a2dd5046ba3009b5780.tar.gz | |
iOS: adjust GitHub Action to new build format
It's frustrating that I can't get the translation.qrc support the translation
files to be created in the build directory. Having them as part of the sources
just feels wrong.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | .github/workflows/ios.yml | 11 | ||||
| -rwxr-xr-x | packaging/ios/build.sh | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index b431ab08a..2736a2e87 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -25,11 +25,8 @@ jobs: xzcat Qt-5.14.1-ios.tar.xz | tar -x -C $HOME/Qt -f - - name: build Subsurface-mobile for iOS run: | - cd packaging/ios + mkdir -p $HOME/build + cd $HOME/build ln -s $HOME/Qt Qt - echo "build dependencies" - bash -x build.sh -simulator - echo "Subsurface-mobile for iOS" - cd build-Subsurface-mobile-*for_iOS-Release - sed -i.bak 's/-Wall/-Wno-everything/' Makefile # make the build far less verbose - make -j2 + echo "build for simulator" + bash -x $GITHUB_WORKSPACE/packaging/ios/build.sh -simulator diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index 55e5e8aac..bd0897c05 100755 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -275,9 +275,9 @@ fi pushd "$SUBSURFACE_SOURCE"/translations SRCS=$(ls ./*.ts | grep -v source) popd -mkdir -p build-ios/translations +mkdir -p "$SUBSURFACE_SOURCE"/packaging/ios/build-ios/translations for src in $SRCS; do - "$IOS_QT"/"$QT_VERSION"/ios/bin/lrelease "$SUBSURFACE_SOURCE"/translations/"$src" -qm build-ios/translations/"${src/.ts/.qm}" + "$IOS_QT"/"$QT_VERSION"/ios/bin/lrelease "$SUBSURFACE_SOURCE"/translations/"$src" -qm "$SUBSURFACE_SOURCE"/packaging/ios/build-ios/translations/"${src/.ts/.qm}" done # in order to be able to use xcode without going through Qt Creator |