Skip to content

Commit 06bc16e

Browse files
use stable20
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
1 parent 3b1dfd2 commit 06bc16e

3 files changed

Lines changed: 16 additions & 10 deletions

File tree

.drone.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,11 @@ steps:
150150
- ./gradlew assembleDebug
151151
- ./scripts/wait_for_emulator.sh
152152
- ./scripts/wait_for_server.sh server-stable-latest
153-
- scripts/deleteOutdatedComments.sh "stable" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
154-
- scripts/deleteOutdatedComments.sh "stable" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
155-
- ./gradlew jacocoTestDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
153+
- scripts/deleteOutdatedComments.sh "stable-latest" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
154+
- scripts/deleteOutdatedComments.sh "stable-latest" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
155+
- ./gradlew jacocoTestDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable-latest" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
156156
- ./gradlew installDebugAndroidTest
157-
- ./gradlew createDebugCoverageReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
157+
- ./gradlew createDebugCoverageReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable-latest" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
158158
- ./gradlew combinedTestReport
159159
- curl -Os https://uploader.codecov.io/latest/linux/codecov
160160
- chmod +x codecov
@@ -187,7 +187,7 @@ services:
187187
- name: server-stable-latest
188188
image: ghcr.io/nextcloud/continuous-integration-shallow-server:latest
189189
environment:
190-
SERVER_VERSION: stable33
190+
SERVER_VERSION: stable32
191191
commands:
192192
- rm /etc/apt/sources.list.d/php.list
193193
- apt-get update && apt-get install -y composer
@@ -229,7 +229,7 @@ services:
229229
- su www-data -c "git clone --depth 1 -b $SERVER_VERSION https://github.com/nextcloud/photos.git /var/www/html/apps/photos/"
230230
- su www-data -c "cd /var/www/html/apps/photos; composer install --no-dev"
231231
- su www-data -c "php /var/www/html/occ app:enable -f photos"
232-
- su www-data -c "git clone --depth 1 -b $SERVER_VERSION https://github.com/nextcloud/assistant.git /var/www/html/apps/assistant/"
232+
- su www-data -c "git clone --depth 1 https://github.com/nextcloud/assistant.git /var/www/html/apps/assistant/"
233233
- su www-data -c "cd /var/www/html/apps/assistant; source ~/.bashrc; composer install --no-dev"
234234
- su www-data -c "php /var/www/html/occ app:enable assistant"
235235
- su www-data -c "php /var/www/html/occ app:enable -f testing"
@@ -272,11 +272,11 @@ steps:
272272
- ./gradlew assembleDebug
273273
- ./scripts/wait_for_emulator.sh
274274
- ./scripts/wait_for_server.sh server-stable-oldest
275-
- scripts/deleteOutdatedComments.sh "stable" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
276-
- scripts/deleteOutdatedComments.sh "stable" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
277-
- ./gradlew jacocoTestDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
275+
- scripts/deleteOutdatedComments.sh "stable-oldest" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
276+
- scripts/deleteOutdatedComments.sh "stable-oldest" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
277+
- ./gradlew jacocoTestDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable-oldest" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
278278
- ./gradlew installDebugAndroidTest
279-
- ./gradlew createDebugCoverageReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
279+
- ./gradlew createDebugCoverageReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable-oldest" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
280280
- ./gradlew combinedTestReport
281281
- curl -Os https://uploader.codecov.io/latest/linux/codecov
282282
- chmod +x codecov

library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardGetWidgetItemsRemoteOperationIT.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ class DashboardGetWidgetItemsRemoteOperationIT : AbstractIT() {
5252

5353
@Test
5454
fun getEmptyItems() {
55+
// only on NC25+
56+
testOnlyOnServer(NextcloudVersion.nextcloud_25)
57+
5558
val widgetId = "nonExistingWidget"
5659
val result =
5760
DashboardGetWidgetItemsRemoteOperation(widgetId, LIMIT_SIZE).execute(nextcloudClient)

library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@ private void checkCapability(OCCapability capability, String userId) {
165165

166166
@Test
167167
public void testClientIntegration() {
168+
// only on NC32+
169+
testOnlyOnServer(NextcloudVersion.nextcloud_32);
170+
168171
// get capabilities
169172
RemoteOperationResult<OCCapability> result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
170173
assertTrue(result.isSuccess());

0 commit comments

Comments
 (0)