From 7adcecda055c269d0ee589f5e3287af958ddf0b3 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Tue, 25 Jun 2024 07:25:54 +0200 Subject: [PATCH 1/4] Test against stable29 Signed-off-by: tobiasKaminsky --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index b93b660a8..8afb8691a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -180,7 +180,7 @@ services: - name: server-stable image: ghcr.io/nextcloud/continuous-integration-shallow-server:latest environment: - SERVER_VERSION: stable27 + SERVER_VERSION: stable29 commands: - apt-get update && apt-get install -y composer - mkdir /var/www/.nvm /var/www/.npm; touch /var/www/.bashrc; chown -R 33:33 /var/www/.nvm /var/www/.npm /var/www/.bashrc @@ -232,6 +232,6 @@ trigger: - pull_request --- kind: signature -hmac: 05ce597eecb009f9783123cd1e1e507ceed79671fcb5544cd8d4eaafb6df49c1 +hmac: a7cbc01fc128b73f00c41ae233cf7f533e952ae11016e00119e162d2d0829bc7 ... From 060db5c56aa3187f034c06ce6d3ff884aa513042 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Tue, 25 Jun 2024 07:31:39 +0200 Subject: [PATCH 2/4] Test against stable29 Signed-off-by: tobiasKaminsky --- .drone.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8afb8691a..184bff493 100644 --- a/.drone.yml +++ b/.drone.yml @@ -81,31 +81,31 @@ services: - su www-data -c "php /var/www/html/occ group:adduser users user1" - su www-data -c "php /var/www/html/occ group:adduser users user2" - su www-data -c "php /var/www/html/occ group:adduser users test" - - su www-data -c "git clone -b master https://github.com/nextcloud/activity.git /var/www/html/apps/activity/" + - su www-data -c "git clone --depth 1 -b master https://github.com/nextcloud/activity.git /var/www/html/apps/activity/" - su www-data -c "php /var/www/html/occ app:enable activity" - - su www-data -c "git clone -b main https://github.com/nextcloud/text.git /var/www/html/apps/text/" + - su www-data -c "git clone --depth 1 -b main https://github.com/nextcloud/text.git /var/www/html/apps/text/" - su www-data -c "php /var/www/html/occ app:enable text" - - su www-data -c "git clone -b master https://github.com/nextcloud/end_to_end_encryption/ /var/www/html/apps/end_to_end_encryption/" + - su www-data -c "git clone --depth 1 -b master https://github.com/nextcloud/end_to_end_encryption/ /var/www/html/apps/end_to_end_encryption/" - su www-data -c "php /var/www/html/occ app:enable end_to_end_encryption" - - su www-data -c "git clone -b master https://github.com/nextcloud/password_policy/ /var/www/html/apps/password_policy/" + - su www-data -c "git clone --depth 1 -b master https://github.com/nextcloud/password_policy/ /var/www/html/apps/password_policy/" - su www-data -c "php /var/www/html/occ app:enable password_policy" - - su www-data -c "git clone -b master https://github.com/nextcloud/external/ /var/www/html/apps/external/" + - su www-data -c "git clone --depth 1 -b master https://github.com/nextcloud/external/ /var/www/html/apps/external/" - su www-data -c "cd /var/www/html/apps/external; composer install --no-dev" - su www-data -c "php /var/www/html/occ app:enable external" - su www-data -c 'php /var/www/html/occ config:app:set external sites --value="{\"1\":{\"id\":1,\"name\":\"Nextcloud\",\"url\":\"https:\/\/www.nextcloud.com\",\"lang\":\"\",\"type\":\"link\",\"device\":\"\",\"icon\":\"external.svg\",\"groups\":[],\"redirect\":false},\"2\":{\"id\":2,\"name\":\"Forum\",\"url\":\"https:\/\/help.nextcloud.com\",\"lang\":\"\",\"type\":\"link\",\"device\":\"\",\"icon\":\"external.svg\",\"groups\":[],\"redirect\":false}}"' - - su www-data -c "git clone -b main https://github.com/nextcloud/files_lock.git /var/www/html/apps/files_lock/" + - su www-data -c "git clone --depth 1 -b main https://github.com/nextcloud/files_lock.git /var/www/html/apps/files_lock/" - su www-data -c "php /var/www/html/occ app:enable -f files_lock" - - su www-data -c "git clone https://github.com/nextcloud/groupfolders.git /var/www/html/apps/groupfolders/" + - su www-data -c "git clone --depth 1 https://github.com/nextcloud/groupfolders.git /var/www/html/apps/groupfolders/" - su www-data -c "php /var/www/html/occ app:enable -f groupfolders" - su www-data -c "php /var/www/html/occ groupfolders:create groupfolder" - su www-data -c "php /var/www/html/occ groupfolders:group 1 users" - - su www-data -c "git clone https://github.com/nextcloud/notifications.git /var/www/html/apps/notifications/" + - su www-data -c "git clone --depth 1 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 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 "git clone --depth 1 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" - - su www-data -c "git clone https://github.com/nextcloud/assistant.git /var/www/html/apps/assistant/" + - su www-data -c "git clone --depth 1 https://github.com/nextcloud/assistant.git /var/www/html/apps/assistant/" - su www-data -c "cd /var/www/html/apps/assistant; source ~/.bashrc; make" - su www-data -c "php /var/www/html/occ app:enable -f assistant" - su www-data -c "php /var/www/html/occ app:enable -f testing" @@ -198,26 +198,26 @@ services: - su www-data -c "php /var/www/html/occ group:adduser users user1" - su www-data -c "php /var/www/html/occ group:adduser users user2" - su www-data -c "php /var/www/html/occ group:adduser users test" - - su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/activity.git /var/www/html/apps/activity/" + - su www-data -c "git clone --depth 1 -b $SERVER_VERSION https://github.com/nextcloud/activity.git /var/www/html/apps/activity/" - su www-data -c "php /var/www/html/occ app:enable activity" - - su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/text.git /var/www/html/apps/text/" + - su www-data -c "git clone --depth 1 -b $SERVER_VERSION https://github.com/nextcloud/text.git /var/www/html/apps/text/" - su www-data -c "php /var/www/html/occ app:enable text" - - su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/end_to_end_encryption.git /var/www/html/apps/end_to_end_encryption/" + - su www-data -c "git clone --depth 1 -b $SERVER_VERSION https://github.com/nextcloud/end_to_end_encryption.git /var/www/html/apps/end_to_end_encryption/" - su www-data -c "php /var/www/html/occ app:enable end_to_end_encryption" - - su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/password_policy.git /var/www/html/apps/password_policy/" + - su www-data -c "git clone --depth 1 -b $SERVER_VERSION https://github.com/nextcloud/password_policy.git /var/www/html/apps/password_policy/" - su www-data -c "php /var/www/html/occ app:enable password_policy" - su www-data -c "php /var/www/html/occ app:enable external" - su www-data -c 'php /var/www/html/occ config:app:set external sites --value="{\"1\":{\"id\":1,\"name\":\"Nextcloud\",\"url\":\"https:\/\/www.nextcloud.com\",\"lang\":\"\",\"type\":\"link\",\"device\":\"\",\"icon\":\"external.svg\",\"groups\":[],\"redirect\":false},\"2\":{\"id\":2,\"name\":\"Forum\",\"url\":\"https:\/\/help.nextcloud.com\",\"lang\":\"\",\"type\":\"link\",\"device\":\"\",\"icon\":\"external.svg\",\"groups\":[],\"redirect\":false}}"' - - su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/files_lock.git /var/www/html/apps/files_lock/" + - su www-data -c "git clone --depth 1 -b $SERVER_VERSION https://github.com/nextcloud/files_lock.git /var/www/html/apps/files_lock/" - su www-data -c "php /var/www/html/occ app:enable files_lock" - - su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/groupfolders.git /var/www/html/apps/groupfolders/" + - su www-data -c "git clone --depth 1 -b $SERVER_VERSION https://github.com/nextcloud/groupfolders.git /var/www/html/apps/groupfolders/" - su www-data -c "php /var/www/html/occ app:enable -f groupfolders" - su www-data -c "php /var/www/html/occ groupfolders:create groupfolder" - su www-data -c "php /var/www/html/occ groupfolders:group 1 users" - - su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/notifications.git /var/www/html/apps/notifications/" + - su www-data -c "git clone --depth 1 -b $SERVER_VERSION 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 notification:generate test test" - - su www-data -c "git clone https://github.com/nextcloud/assistant.git /var/www/html/apps/assistant/" + - su www-data -c "git clone --depth 1 https://github.com/nextcloud/assistant.git /var/www/html/apps/assistant/" - su www-data -c "cd /var/www/html/apps/assistant; git checkout tags/v1.0.2; source ~/.bashrc; make" - su www-data -c "php /var/www/html/occ app:enable -f assistant" - su www-data -c "php /var/www/html/occ app:enable -f testing" @@ -232,6 +232,6 @@ trigger: - pull_request --- kind: signature -hmac: a7cbc01fc128b73f00c41ae233cf7f533e952ae11016e00119e162d2d0829bc7 +hmac: fb2641d6c8da6f678cdc6e9b144118d6b66f802721933958e1932f56b2b4eac0 ... From ed29bffb17d693ed32fb14c460d4f8c8f61c4a29 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Tue, 25 Jun 2024 07:54:00 +0200 Subject: [PATCH 3/4] update url for failing reports Signed-off-by: tobiasKaminsky --- scripts/uploadReport.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/uploadReport.sh b/scripts/uploadReport.sh index 52b440626..c9b4a0534 100755 --- a/scripts/uploadReport.sh +++ b/scripts/uploadReport.sh @@ -14,7 +14,7 @@ GIT_USERNAME=$7 GIT_TOKEN=$8 REMOTE_FOLDER=$ID-$TYPE-$BRANCH-$(date +%H-%M) 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/android-library-integrationTests # upload logcat log_filename=$ID"_logcat.txt.xz" @@ -39,7 +39,7 @@ fi find . -type d -exec curl -u $USER:$PASS -X MKCOL $URL/$REMOTE_FOLDER/$(echo {} | sed s#\./##) \; find . -type f -exec curl -u $USER:$PASS -X PUT $URL/$REMOTE_FOLDER/$(echo {} | sed s#\./##) --upload-file {} \; -echo "Uploaded failing library tests to https://www.kaminsky.me/nc-dev/library-integrationTests/$REMOTE_FOLDER" +echo "Uploaded failing library tests to https://www.kaminsky.me/nc-dev/android-library-integrationTests/$REMOTE_FOLDER" -curl -u $GIT_USERNAME:$GIT_TOKEN -X POST https://api.github.com/repos/nextcloud/android-library/issues/$PR_ID/comments -d "{ \"body\" : \"$BRANCH_TYPE test failed: https://www.kaminsky.me/nc-dev/library-integrationTests/$REMOTE_FOLDER/debug/ \" }" +curl -u $GIT_USERNAME:$GIT_TOKEN -X POST https://api.github.com/repos/nextcloud/android-library/issues/$PR_ID/comments -d "{ \"body\" : \"$BRANCH_TYPE test failed: https://www.kaminsky.me/nc-dev/android-library-integrationTests/$REMOTE_FOLDER/debug/ \" }" exit 1 From b11e4b827c2e509b8e330145d88098c0611a63e3 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Tue, 25 Jun 2024 07:59:46 +0200 Subject: [PATCH 4/4] enable photos on stable Signed-off-by: tobiasKaminsky --- .drone.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 184bff493..6e84acc33 100644 --- a/.drone.yml +++ b/.drone.yml @@ -221,6 +221,9 @@ services: - su www-data -c "cd /var/www/html/apps/assistant; git checkout tags/v1.0.2; source ~/.bashrc; make" - su www-data -c "php /var/www/html/occ app:enable -f assistant" - su www-data -c "php /var/www/html/occ app:enable -f testing" + - su www-data -c "git clone --depth 1 -b $SERVER_VERSION 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 trigger: @@ -232,6 +235,6 @@ trigger: - pull_request --- kind: signature -hmac: fb2641d6c8da6f678cdc6e9b144118d6b66f802721933958e1932f56b2b4eac0 +hmac: 2c8cb534b0d423fcc1181a27dcb42c1c19f00ab1881b3bef5eb77602212f4eac ...