Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 672ce1e2 authored by tobiasKaminsky's avatar tobiasKaminsky
Browse files

re-enable photos 


upload logcat

Signed-off-by: default avatartobiasKaminsky <tobias@kaminsky.me>
parent 21706a4a

.drone.yml

+5 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,8 @@ steps: 
    - ./scripts/wait_for_server.sh server-master

    - ./scripts/wait_for_server.sh server-master

    - scripts/deleteOutdatedComments.sh "master" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN

    - scripts/deleteOutdatedComments.sh "master" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN

    - scripts/deleteOutdatedComments.sh "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN

    - scripts/deleteOutdatedComments.sh "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN

    - adb logcat -c

    - adb logcat > logcat.txt &

    - ./gradlew jacocoTestDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN

    - ./gradlew jacocoTestDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN

    - ./gradlew installDebugAndroidTest

    - ./gradlew installDebugAndroidTest

    - ./gradlew createDebugCoverageReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN

    - ./gradlew createDebugCoverageReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
@@ -94,6 +96,9 @@ services: 
      - su www-data -c "git clone https://github.com/nextcloud/notifications.git /var/www/html/apps/notifications/"

      - su www-data -c "git clone https://github.com/nextcloud/notifications.git /var/www/html/apps/notifications/"

      - su www-data -c "php /var/www/html/occ app:enable -f notifications"

      - su www-data -c "php /var/www/html/occ app:enable -f notifications"

      - su www-data -c "php /var/www/html/occ notification:generate test -d test"

      - su www-data -c "php /var/www/html/occ notification:generate test -d test"

      - su www-data -c "git clone https://github.com/nextcloud/photos.git /var/www/html/apps/photos/"

      - su www-data -c "cd /var/www/html/apps/photos; composer install"

      - su www-data -c "php /var/www/html/occ app:enable -f photos"

      - /usr/local/bin/run.sh

      - /usr/local/bin/run.sh





trigger:

trigger:

scripts/uploadReport.sh

+9 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,15 @@ REMOTE_FOLDER=$ID-$TYPE-$BRANCH-$(date +%H-%M) 
BRANCH_TYPE=$BRANCH-$TYPE

BRANCH_TYPE=$BRANCH-$TYPE

URL=https://nextcloud.kaminsky.me/remote.php/dav/files/$USER/library-integrationTests

URL=https://nextcloud.kaminsky.me/remote.php/dav/files/$USER/library-integrationTests





# upload logcat

log_filename="${$ID}_logcat.txt.xz"

log_file="${log_filename}"

upload_path="https://nextcloud.kaminsky.me/remote.php/webdav/library-logcat/$log_filename"

xz logcat.txt

mv logcat.txt.xz "$log_file"

curl -u "${$USER}:${$PASS}" -X PUT "$upload_path" --upload-file "$log_file"

echo >&2 "Uploaded logcat to https://www.kaminsky.me/nc-dev/library-logcat/$log_filename"



if [ $TYPE = "IT" ]; then

if [ $TYPE = "IT" ]; then

    cd library/build/reports/androidTests/connected

    cd library/build/reports/androidTests/connected

else 

else