chore: update workflows from templates

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
nextcloud · Dec 26, 2023 · 5ef0430 · 5ef0430
1 parent 1c3455d
commit 5ef0430
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
@@ -61,15 +61,6 @@ jobs:
         env:
           MYSQL_ROOT_PASSWORD: rootpassword
         options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5
-      openldap:
-        image: ghcr.io/nextcloud/continuous-integration-openldap:openldap-7
-        ports:
-          - 389:389
-        env:
-          SLAPD_DOMAIN: nextcloud.ci
-          SLAPD_ORGANIZATION: Nextcloud
-          SLAPD_PASSWORD: admin
-          SLAPD_ADDITIONAL_MODULES: memberof
 
     steps:
       - name: Set app env
@@ -94,7 +85,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
-          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, mysql, pdo_mysql, ldap
+          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, mysql, pdo_mysql
           coverage: none
           ini-file: development
         env:
@@ -123,7 +114,6 @@ jobs:
         run: |
           mkdir data
           ./occ maintenance:install --verbose --database=mysql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
-          ./occ app:enable --force user_ldap
           ./occ app:enable --force ${{ env.APP_NAME }}
 
       - name: Check PHPUnit script is defined
@@ -155,8 +145,6 @@ jobs:
         # Only run if phpunit integration config file exists
         if: steps.check_integration.outcome == 'success'
         working-directory: apps/${{ env.APP_NAME }}
-        env:
-          LDAP_HOST: localhost
         run: composer run test:integration
 
       - name: Print logs

diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -24,7 +24,6 @@ jobs:
         uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
         with:
           php-version: 8.2
-          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, mysql, pdo_mysql, ldap
           coverage: none
           ini-file: development
         env: