Skip to content

Commit

Permalink
wip: Upgrade to Quasar 2 / Vue 3 - try to fix cordova build #393
Browse files Browse the repository at this point in the history
  • Loading branch information
cnouguier committed Aug 22, 2022
1 parent 464e1ad commit 793df60
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 29 deletions.
6 changes: 3 additions & 3 deletions .travis.android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ npm run cordova:build:android > android.build.log 2>&1
EXIT_CODE=$?
# Copy the log whatever the result
rclone copy android.build.log scw:kalisio-builds/${BUILD_BUCKET}/android.build.log
check_code $EXIT_CODE "Building the app"
check_code $EXIT_CODE 0 "Building the app"

# Backup the android build to S3
rclone copy src-cordova/platforms/android/app/build/outputs/apk scw:kalisio-builds/${BUILD_BUCKET}/android > /dev/null
check_code $? "Copying the artefact to s3"
check_code $? 0 "Copying the artefact to s3"

travis_fold end "build"

Expand All @@ -57,7 +57,7 @@ fastlane android $NODE_APP_INSTANCE > android.deploy.log 2>&1
EXIT_CODE=$?
# Copy the log whatever the result
rclone copy android.deploy.log scw:kalisio-builds/${BUILD_BUCKET}/android.deploy.log
check_code $? "Deploying the app"
check_code $? 0 "Deploying the app"

travis_fold end "deploy"

6 changes: 3 additions & 3 deletions .travis.app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ travis_fold start "build"
yarn build
EXIT_CODE=$?
tail -n 24 build.log
check_code $EXIT_CODE "Builing the client"
check_code $EXIT_CODE 0 "Builing the client"

# Log in to docker before building the app because of rate limiting
docker login -u="$DOCKER_USER" -p="$DOCKER_PASSWORD"
check_code $? "Connecting to Docker"
check_code $? 0 "Connecting to Docker"

# Create an archive to speed docker build process and build the image
cd ../..
tar --exclude='kalisio/aktnmap/test' -zcf kalisio.tgz kalisio
docker build --build-arg APP=$APP --build-arg FLAVOR=$FLAVOR --build-arg BUILD_NUMBER=$BUILD_NUMBER -f dockerfile -t kalisio/$APP:$TAG .
check_code $? "Building the app docker image"
check_code $? 0 "Building the app docker image"

travis_fold end "build"

Expand Down
4 changes: 2 additions & 2 deletions .travis.env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

check_code()
{
if [ $1 -eq 1 ]; then
echo "$2 has failed [error: $1]"
if [ $1 -eq $2 ]; then
echo "$3 has failed [error: $1]"
exit 1
fi
}
Expand Down
6 changes: 3 additions & 3 deletions .travis.ios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ npm run cordova:build:ios > ios.build.log 2>&1
EXIT_CODE=$?
# Copy the log whatever the result
rclone copy ios.build.log scw:kalisio-builds/${BUILD_BUCKET}/ios.build.log
# check_code $EXIT_CODE "Building the app"
check_code $EXIT_CODE 1 "Building the app"

# Backup the ios build to S3
rclone copy src-cordova/platforms/ios/build scw:kalisio-builds/${BUILD_BUCKET}/ios > /dev/null
check_code $? "Copying the artefact to s3"
check_code $? 0 "Copying the artefact to s3"

travis_fold end "build"

Expand All @@ -75,7 +75,7 @@ xcrun altool --upload-app -t ios -f "./src-cordova/platforms/ios/build/device/$T
EXIT_CODE=$?
# Copy the log whatever the result
rclone copy ios.deploy.log scw:kalisio-builds/${BUILD_BUCKET}/ios.deploy.log
check_code $EXIT_CODE "Deploying the app"
check_code $EXIT_CODE 0 "Deploying the app"

travis_fold end "deploy"

3 changes: 1 addition & 2 deletions src-cordova/config.xml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@
<splash density="port-xxxhdpi" src="res/screens/android/screen-xxxhdpi-portrait.png"/>
</platform>
<platform name="ios">
<!--hook src="hooks/ios-update-pods.sh" type="before_platform_add"/-->
<hook src="hooks/ios-run-pods.sh" type="before_plugin_install"/>
<hook src="hooks/ios-install-pod.sh" type="before_plugin_install"/>
<allow-intent href="itms:*"/>
<allow-intent href="itms-apps:*"/>
<feature name="CDVWKWebViewEngine">
Expand Down
File renamed without changes.
16 changes: 0 additions & 16 deletions src-cordova/hooks/ios-update-pods.sh

This file was deleted.

0 comments on commit 793df60

Please sign in to comment.