Merge pull request #264 from nextcloud/fix/noid/1.2-compat

adjust version on 1.2 branch
nextcloud · Jan 29, 2021 · 44ebc35 · 44ebc35
2 parents e6e89e2 + 27a7477
commit 44ebc35
Show file tree

Hide file tree

Showing 5 changed files with 1,955 additions and 528 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -5,7 +5,7 @@ steps:
     image: nextcloudci/php7.4:php7.4-2
     environment:
       APP_NAME: ldap_write_support
-      CORE_BRANCH: master
+      CORE_BRANCH: stable20
       DB: sqlite
     commands:
       # Pre-setup steps
@@ -28,7 +28,7 @@ steps:
     image: nextcloudci/php7.3:php7.3-5
     environment:
       APP_NAME: ldap_write_support
-      CORE_BRANCH: master
+      CORE_BRANCH: stable20
       DB: sqlite
     commands:
       - composer install
@@ -37,7 +37,7 @@ steps:
     image: nextcloudci/php7.4:php7.4-2
     environment:
       APP_NAME: ldap_write_support
-      CORE_BRANCH: master
+      CORE_BRANCH: stable20
       DB: sqlite
     commands:
       - composer install
@@ -52,90 +52,6 @@ trigger:
     - push
 ---
 kind: pipeline
-name: integration-master
-steps:
-  - name: integration
-    image: nextcloudci/php7.4:php7.4-2
-    environment:
-      APP_NAME: ldap_write_support
-      CORE_BRANCH: master
-      DB: sqlite
-    commands:
-      # Pre-setup steps
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server/
-      - php occ config:system:set redis host --value=cache
-      - php occ config:system:set redis port --value=6379 --type=integer
-      - php occ config:system:set redis timeout --value=0 --type=integer
-      - php occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
-      - php occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
-      - php occ app:enable user_ldap
-      - php occ app:enable $APP_NAME
-      - cd apps/$APP_NAME
-      - cd tests/integration
-      - ./run.sh
-
-services:
-  - name: cache
-    image: redis
-  - name: openldap
-    image: nextcloudci/openldap:openldap-7
-    environment:
-      SLAPD_DOMAIN: nextcloud.ci
-      SLAPD_ORGANIZATION: Nextcloud
-      SLAPD_PASSWORD: admin
-      SLAPD_ADDITIONAL_MODULES: memberof
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-type: docker
-
----
-kind: pipeline
-name: integration-master-nocache
-steps:
-  - name: integration
-    image: nextcloudci/php7.4:php7.4-2
-    environment:
-      APP_NAME: ldap_write_support
-      CORE_BRANCH: master
-      DB: sqlite
-    commands:
-      # Pre-setup steps
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server/
-      - php occ app:enable user_ldap
-      - php occ app:enable $APP_NAME
-      - cd apps/$APP_NAME
-      - cd tests/integration
-      - ./run.sh
-
-services:
-  - name: openldap
-    image: nextcloudci/openldap:openldap-7
-    environment:
-      SLAPD_DOMAIN: nextcloud.ci
-      SLAPD_ORGANIZATION: Nextcloud
-      SLAPD_PASSWORD: admin
-      SLAPD_ADDITIONAL_MODULES: memberof
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-type: docker
----
-kind: pipeline
 name: integration-stable20
 steps:
   - name: integration

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -11,7 +11,7 @@
 * auto generate a user id (optional)
 * and more behavioral switches
     ]]></description>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <licence>agpl</licence>
     <author mail="alan@eita.org.br" homepage="http://eita.org.br">Alan Freihof Tygel</author>
     <author mail="blizzz@arthur-schiwon.de" homepage="https://arthur-schiwon.de">Arthur Schiwon</author>
@@ -24,7 +24,7 @@
     <screenshot>https://raw.githubusercontent.com/nextcloud/ldap_write_support/master/img/screenshots/settings.png</screenshot>
     <screenshot>https://raw.githubusercontent.com/nextcloud/ldap_write_support/master/img/screenshots/users.png</screenshot>
     <dependencies>
-        <nextcloud min-version="20" max-version="21"/>
+        <nextcloud min-version="20" max-version="20"/>
     </dependencies>
     <commands>
         <command>OCA\LdapWriteSupport\Command\GroupAdminsToLdap</command>