From f19e548927f568c5d5aafebc68b2729c13822e8d Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 24 Jun 2021 13:55:51 +0200 Subject: Update stable22 target versions Signed-off-by: Joas Schilling --- .github/workflows/oci.yml | 73 ---------------------------------- .github/workflows/phpunit.yml | 92 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 80 insertions(+), 85 deletions(-) delete mode 100644 .github/workflows/oci.yml diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml deleted file mode 100644 index fabf4f9..0000000 --- a/.github/workflows/oci.yml +++ /dev/null @@ -1,73 +0,0 @@ -name: PHPUnit - -on: - pull_request: - push: - branches: - - master - - stable* - -env: - APP_NAME: files_pdfviewer - -jobs: - 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: ['master'] - - 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 }} - - - 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 - - - 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 diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 27fb76d..835aaed 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -20,15 +20,16 @@ jobs: matrix: php-versions: ['7.4'] databases: ['sqlite'] - - name: php${{ matrix.php-versions }}-${{ matrix.databases }} + server-versions: ['stable22'] + + name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} steps: - name: Checkout server uses: actions/checkout@v2 with: repository: nextcloud/server - ref: ${{ github.base_ref }} + ref: ${{ matrix.server-versions }} - name: Checkout submodules shell: bash @@ -58,7 +59,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 & @@ -79,8 +80,9 @@ jobs: matrix: php-versions: ['7.3', '7.4'] databases: ['mysql'] - - name: php${{ matrix.php-versions }}-${{ matrix.databases }} + server-versions: ['stable22'] + + name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} services: mysql: @@ -96,7 +98,7 @@ jobs: uses: actions/checkout@v2 with: repository: nextcloud/server - ref: ${{ github.base_ref }} + ref: ${{ matrix.server-versions }} - name: Checkout submodules shell: bash @@ -127,7 +129,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 & @@ -148,8 +150,9 @@ jobs: matrix: php-versions: ['7.4'] databases: ['pgsql'] - - name: php${{ matrix.php-versions }}-${{ matrix.databases }} + server-versions: ['stable22'] + + name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} services: postgres: @@ -167,7 +170,7 @@ jobs: uses: actions/checkout@v2 with: repository: nextcloud/server - ref: ${{ github.base_ref }} + ref: ${{ matrix.server-versions }} - name: Checkout submodules shell: bash @@ -198,7 +201,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 & @@ -209,3 +212,68 @@ 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 }} + + - 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 + + - 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 -- cgit v1.2.3