diff options
| author | Joas Schilling <coding@schilljs.com> | 2020-12-16 12:26:05 +0300 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2020-12-17 17:15:37 +0300 |
| commit | df342d68b2ee2114c9ced91f4cd82aae7767f68d (patch) | |
| tree | 3f0d47ab1f4d873ab7e70bd65fe01c977d8f01a4 /.github | |
| parent | 250139d4268e9d44821e28b8854c7d6997bef95b (diff) | |
Adjust existing actions to app-tutorial
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/dependabot-approve.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/lint.yml | 14 |
2 files changed, 21 insertions, 5 deletions
diff --git a/.github/workflows/dependabot-approve.yml b/.github/workflows/dependabot-approve.yml index cc5e6d17c..5d7fd68ff 100644 --- a/.github/workflows/dependabot-approve.yml +++ b/.github/workflows/dependabot-approve.yml @@ -2,10 +2,18 @@ name: Dependabot auto approve on: pull_request jobs: - build: + auto-merge: runs-on: ubuntu-latest steps: + # Default github action approve - uses: hmarr/auto-approve-action@v2.0.0 if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' with: - github-token: "${{ secrets.GITHUB_TOKEN }}" + github-token: ${{ secrets.GITHUB_TOKEN }} + + # Nextcloud bot approve and merge request + - uses: ahmadnassri/action-dependabot-auto-merge@v1 + if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' + with: + target: patch + github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5fb46d01d..cd5a2ddaa 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -29,18 +29,26 @@ jobs: run: composer run lint || ( echo 'Please run `composer run lint` and fix your code' && exit 1 ) php-cs-fixer: - name: php-cs check runs-on: ubuntu-latest + + strategy: + matrix: + php-versions: ['7.4'] + + name: cs php${{ matrix.php-versions }} steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@v2 + - name: Set up php uses: shivammathur/setup-php@master with: - php-version: 7.4 + php-version: ${{ matrix.php-versions }} coverage: none + - name: Install dependencies run: composer i + - name: Run coding standards check run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 ) |