From ade485b32df310cc9393e153c017065af61bcda1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Wed, 26 Feb 2020 13:31:37 +0100 Subject: [PATCH] Use app-tutorial actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- .github/workflows/lint.yml | 67 +++++++---- .github/workflows/node.yml | 34 ++++++ .github/workflows/nodejs.yml | 32 ----- .github/workflows/phpunit.yml | 221 ++++++++++++++++++++++++++++++++++ .travis.yml | 60 --------- 5 files changed, 296 insertions(+), 118 deletions(-) create mode 100644 .github/workflows/node.yml delete mode 100644 .github/workflows/nodejs.yml create mode 100644 .github/workflows/phpunit.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3e50644..229fb49 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,36 +1,51 @@ name: Lint -on: pull_request + +on: + pull_request: + push: + branches: + - master + - stable* jobs: - php-linters: + php: runs-on: ubuntu-latest + strategy: matrix: - php-versions: ['7.2', '7.3', 7.4] - name: php${{ matrix.php-versions }} lint + php-versions: ['7.2', '7.3', '7.4'] + + name: php${{ matrix.php-versions }} steps: - - name: Checkout - uses: actions/checkout@master - - name: Set up php${{ matrix.php-versions }} - uses: shivammathur/setup-php@master - with: - php-version: ${{ matrix.php-versions }} - coverage: none - - name: Lint - run: composer run lint + - uses: actions/checkout@v2 - node-linters: + - name: Set up php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@v1 + with: + php-version: ${{ matrix.php-versions }} + coverage: none + + - name: Lint + run: composer run lint + + node: runs-on: ubuntu-latest - name: ESLint + + strategy: + matrix: + node-versions: [12.x] + + name: node${{ matrix.node-versions }} steps: - - uses: actions/checkout@master - - name: Set up Node - uses: actions/setup-node@v1 - with: - node-version: 12.x - - name: npm install - run: npm ci - - name: eslint - run: npm run lint - env: - CI: true + - uses: actions/checkout@v2 + + - name: Set up node ${{ matrix.node-versions }} + uses: actions/setup-node@v1 + with: + node-versions: ${{ matrix.node-versions }} + + - name: Install dependencies + run: npm ci + + - name: Lint + run: npm run lint diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml new file mode 100644 index 0000000..d5c403d --- /dev/null +++ b/.github/workflows/node.yml @@ -0,0 +1,34 @@ +name: Node + +on: + pull_request: + push: + branches: + - master + - stable* + +jobs: + build: + runs-on: ubuntu-latest + + strategy: + matrix: + node-versions: [12.x] + + name: node${{ matrix.node-versions }} + steps: + - uses: actions/checkout@v2 + + - name: Set up node ${{ matrix.node-versions }} + uses: actions/setup-node@v1 + with: + node-versions: ${{ matrix.node-versions }} + + - name: Install dependencies & build + run: | + npm ci + npm run build --if-present + + - name: Check webpack build changes + run: | + bash -c "[[ ! \"`git status --porcelain `\" ]] || ( echo 'Uncommited changes in webpack build' && git status && exit 1 )" diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml deleted file mode 100644 index df207ce..0000000 --- a/.github/workflows/nodejs.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Node CI - -on: - pull_request: - branches: - - master - - stable* - -jobs: - build: - - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [12.x] - - steps: - - uses: actions/checkout@v1 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - name: npm install, build - run: | - npm ci - npm run build --if-present - - name: check webpack build - run: | - bash -c "[[ ! \"`git status --porcelain `\" ]] || ( echo 'Uncommited changes in webpack build' && git status && exit 1 )" - env: - CI: true diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml new file mode 100644 index 0000000..7a4f7b4 --- /dev/null +++ b/.github/workflows/phpunit.yml @@ -0,0 +1,221 @@ +name: PHPUnit + +on: + pull_request: + push: + branches: + - master + - stable* + +env: + APP_NAME: forms + +jobs: + php: + runs-on: ubuntu-latest + + strategy: + # do not stop on another job's failure + fail-fast: false + matrix: + php-versions: ['7.4'] + databases: ['sqlite'] + server-versions: ['master'] + + name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} + + 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 php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@v1 + with: + php-version: ${{ matrix.php-versions }} + tools: phpunit + extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite + coverage: none + + - name: Set up PHPUnit + working-directory: apps/${{ env.APP_NAME }} + run: composer i + + - name: Set up Nextcloud + env: + 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 app:enable ${{ env.APP_NAME }} + php -S localhost:8080 & + + - name: PHPUnit + working-directory: apps/${{ env.APP_NAME }} + run: ./vendor/phpunit/phpunit/phpunit -c phpunit.xml + + - name: PHPUnit integration + working-directory: apps/${{ env.APP_NAME }} + run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml + + - name: Generate coverage + working-directory: apps/${{ env.APP_NAME }} + run: | + wget https://scrutinizer-ci.com/ocular.phar + php ocular.phar code-coverage:upload --format=php-clover clover.xml + + mysql: + runs-on: ubuntu-latest + + strategy: + # do not stop on another job's failure + fail-fast: false + matrix: + php-versions: ['7.2', '7.3', '7.4'] + databases: ['mysql'] + server-versions: ['master'] + + name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} + + services: + mysql: + image: mariadb + ports: + - 4444:3306/tcp + env: + MYSQL_ROOT_PASSWORD: rootpassword + options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5 + + 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 php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@v1 + with: + php-version: ${{ matrix.php-versions }} + tools: phpunit + extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql + coverage: none + + - name: Set up PHPUnit + working-directory: apps/${{ env.APP_NAME }} + run: composer i + + - name: Set up Nextcloud + env: + 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 app:enable ${{ env.APP_NAME }} + php -S localhost:8080 & + + - name: PHPUnit + working-directory: apps/${{ env.APP_NAME }} + run: ./vendor/phpunit/phpunit/phpunit -c phpunit.xml + + - name: PHPUnit integration + working-directory: apps/${{ env.APP_NAME }} + run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml + + pgsql: + runs-on: ubuntu-latest + + strategy: + # do not stop on another job's failure + fail-fast: false + matrix: + php-versions: ['7.4'] + databases: ['pgsql'] + server-versions: ['master'] + + name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} + + services: + postgres: + image: postgres + ports: + - 4444:5432/tcp + env: + POSTGRES_USER: root + POSTGRES_PASSWORD: rootpassword + POSTGRES_DB: nextcloud + options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5 + + 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 php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@v1 + with: + php-version: ${{ matrix.php-versions }} + tools: phpunit + extensions: mbstring, iconv, fileinfo, intl, pgsql, pdo_pgsql + coverage: none + + - name: Set up PHPUnit + working-directory: apps/${{ env.APP_NAME }} + run: composer i + + - name: Set up Nextcloud + env: + 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 app:enable ${{ env.APP_NAME }} + php -S localhost:8080 & + + - name: PHPUnit + working-directory: apps/${{ env.APP_NAME }} + run: ./vendor/phpunit/phpunit/phpunit -c phpunit.xml + + - name: PHPUnit integration + working-directory: apps/${{ env.APP_NAME }} + run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0ce77cc..0000000 --- a/.travis.yml +++ /dev/null @@ -1,60 +0,0 @@ -sudo: false -dist: trusty -language: php - -services: - - mysql - - postgresql - -php: - - 7.2 - - 7.3 - # https://travis-ci.community/t/some-extensions-are-missing-in-php-7-4-0-zip-gmp-sodium/6320/8 - # - 7.4 - -addons: - postgresql: 9.5 - apt: - packages: - - libxml2-utils - -env: - global: - - CORE_BRANCH=master - - APP_NAME=forms - matrix: - - DB=mysql - - DB=pgsql - - DB=sqlite - -cache: - directories: - - $HOME/.composer/cache - -before_install: - # Install NC and app - - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh; - - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB - - cd ../server; - - ./occ app:enable $APP_NAME - -before_script: - - cd apps/$APP_NAME - -script: - # Check info.xml schema validity - - wget https://apps.nextcloud.com/schema/apps/info.xsd - - xmllint appinfo/info.xml --schema info.xsd --noout - - rm info.xsd - # Check PHP syntax errors - - find . -name \*.php -exec php -l "{}" \; - # Execute tests - - make test - -after_success: - # Generate Code Coverage - - wget https://scrutinizer-ci.com/ocular.phar - - php ocular.phar code-coverage:upload --format=php-clover clover.xml - -after_failure: - - cat ../../data/nextcloud.log