From 07c28f1576a0a3ff96fa1aed02e374ffe6434e5b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 10 Nov 2020 18:49:02 +0100 Subject: [PATCH] Fix naming of jobs and steps Signed-off-by: Joas Schilling --- .github/workflows/oci.yml | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml index 87cc1d41d4..5b545461e5 100644 --- a/.github/workflows/oci.yml +++ b/.github/workflows/oci.yml @@ -1,17 +1,24 @@ -name: "Unit tests" +name: PHPUnit on: + pull_request: push: + branches: + - master + - stable* jobs: phpunit-oci8: - name: "PHPUnit on OCI8" - runs-on: "ubuntu-latest" + runs-on: ubuntu-latest strategy: + # do not stop on another job's failure + fail-fast: false matrix: - php-version: - - "7.4" + php-versions: [ '7.4' ] + databases: [ 'oci' ] + + name: php${{ matrix.php-versions }}-${{ matrix.databases }} services: oracle: @@ -20,8 +27,8 @@ jobs: - "1521:1521" steps: - - name: "Checkout" - uses: "actions/checkout@v2" + - name: Checkout server + uses: actions/checkout@v2 - name: Checkout submodules shell: bash @@ -30,10 +37,10 @@ jobs: git submodule sync --recursive git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 - - name: "Install PHP" - uses: "shivammathur/setup-php@v2" + - name: Set up php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@v2 with: - php-version: "${{ matrix.php-version }}" + php-version: ${{ matrix.php-versions }} extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, oci8 tools: phpunit:8.5.2 coverage: none @@ -42,12 +49,8 @@ jobs: 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 - - # Generate instance id by loading index.php - - name: Generate instance id by loading index.php - run: | php -f index.php - - name: Run phpunit - run: | - cd tests && phpunit --configuration phpunit-autotest.xml --group DB,SLOWDB + - name: PHPUnit + working-directory: tests + run: phpunit --configuration phpunit-autotest.xml --group DB,SLOWDB