From c8cc5726591028652bd5c56272059a7e4c84fd27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Mon, 6 Sep 2021 18:19:16 +0200 Subject: [PATCH 1/2] Fix phpunit --- .github/workflows/phpunit.yml | 98 ++++++----------------------------- 1 file changed, 15 insertions(+), 83 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 912c8058..0670976f 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -20,17 +20,16 @@ jobs: matrix: php-versions: ['7.4'] databases: ['sqlite'] - server-versions: ['stable22'] - - name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} + + name: php${{ matrix.php-versions }}-${{ matrix.databases }} steps: - name: Checkout server uses: actions/checkout@v2 with: repository: nextcloud/server - ref: ${{ matrix.server-versions }} - submodules: true + ref: ${{ github.base_ref }} + submodule: true - name: Checkout app uses: actions/checkout@v2 @@ -53,7 +52,7 @@ jobs: DB_PORT: 4444 run: | mkdir data - ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password + ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password ./occ app:enable --force ${{ env.APP_NAME }} php -S localhost:8080 & @@ -74,9 +73,8 @@ jobs: matrix: php-versions: ['7.3', '7.4'] databases: ['mysql'] - server-versions: ['stable22'] - - name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} + + name: php${{ matrix.php-versions }}-${{ matrix.databases }} services: mysql: @@ -92,14 +90,8 @@ jobs: uses: actions/checkout@v2 with: repository: nextcloud/server - ref: ${{ matrix.server-versions }} - - - name: Checkout submodules - shell: bash - run: | - auth_header="$(git config --local --get http.https://github.com/.extraheader)" - git submodule sync --recursive - git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 + ref: ${{ github.base_ref }} + submodule: true - name: Checkout app uses: actions/checkout@v2 @@ -123,7 +115,7 @@ jobs: DB_PORT: 4444 run: | mkdir data - ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password + ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password ./occ app:enable --force ${{ env.APP_NAME }} php -S localhost:8080 & @@ -144,9 +136,8 @@ jobs: matrix: php-versions: ['7.4'] databases: ['pgsql'] - server-versions: ['stable22'] - - name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} + + name: php${{ matrix.php-versions }}-${{ matrix.databases }} services: postgres: @@ -164,8 +155,8 @@ jobs: uses: actions/checkout@v2 with: repository: nextcloud/server - ref: ${{ matrix.server-versions }} - submodules: true + ref: ${{ github.base_ref }} + submodule: true - name: Checkout app uses: actions/checkout@v2 @@ -189,7 +180,7 @@ jobs: DB_PORT: 4444 run: | mkdir data - ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password + ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password ./occ app:enable --force ${{ env.APP_NAME }} php -S localhost:8080 & @@ -200,62 +191,3 @@ jobs: # - name: PHPUnit integration # working-directory: apps/${{ env.APP_NAME }} # run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml - - oci: - runs-on: ubuntu-latest - - strategy: - # do not stop on another job's failure - fail-fast: false - matrix: - php-versions: ['7.4'] - databases: ['oci'] - server-versions: ['stable22'] - - name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} - - services: - oracle: - image: deepdiver/docker-oracle-xe-11g # "wnameless/oracle-xe-11g-r2" - ports: - - "1521:1521" - - steps: - - name: Checkout server - uses: actions/checkout@v2 - with: - repository: nextcloud/server - ref: ${{ matrix.server-versions }} - submodules: true - - - name: Checkout app - uses: actions/checkout@v2 - with: - path: apps/${{ env.APP_NAME }} - - - name: Set up PHPUnit - working-directory: apps/${{ env.APP_NAME }} - run: composer i - - - name: Set up php ${{ matrix.php-versions }} - uses: "shivammathur/setup-php@v2" - with: - php-version: "${{ matrix.php-versions }}" - extensions: mbstring, iconv, fileinfo, intl, oci8 - tools: phpunit:8.5.2 - coverage: none - - - name: Set up Nextcloud - run: | - mkdir data - ./occ maintenance:install --verbose --database=oci --database-name=XE --database-host=127.0.0.1 --database-port=1521 --database-user=autotest --database-pass=owncloud --admin-user admin --admin-pass admin - php -f index.php - ./occ app:enable --force ${{ env.APP_NAME }} - - - name: PHPUnit - working-directory: apps/${{ env.APP_NAME }} - run: phpunit -c phpunit.xml - - # - name: PHPUnit integration - # working-directory: apps/${{ env.APP_NAME }} - # run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml From c5ecfdd7d72b3ab574d0fa9e9e3ece3f3d6713f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Mon, 6 Sep 2021 18:20:20 +0200 Subject: [PATCH 2/2] Fix submodules --- .github/workflows/phpunit.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 0670976f..5d1925be 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -29,7 +29,7 @@ jobs: with: repository: nextcloud/server ref: ${{ github.base_ref }} - submodule: true + submodules: true - name: Checkout app uses: actions/checkout@v2 @@ -91,7 +91,7 @@ jobs: with: repository: nextcloud/server ref: ${{ github.base_ref }} - submodule: true + submodules: true - name: Checkout app uses: actions/checkout@v2 @@ -156,7 +156,7 @@ jobs: with: repository: nextcloud/server ref: ${{ github.base_ref }} - submodule: true + submodules: true - name: Checkout app uses: actions/checkout@v2