Skip to content

Commit

Permalink
Merge pull request #207 from nextcloud/update-master-version
Browse files Browse the repository at this point in the history
  • Loading branch information
come-nc authored Jan 23, 2024
2 parents a41ed44 + 3515e88 commit befbd70
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 135 deletions.
120 changes: 0 additions & 120 deletions .github/workflows/phpunit-sqlite.yml

This file was deleted.

31 changes: 19 additions & 12 deletions .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
# This workflow is provided via the organization template repository
#
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization

name: Static analysis

on:
pull_request:
push:
branches:
- master
- main
- stable*
on: pull_request

concurrency:
group: psalm-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
static-analysis:
runs-on: ubuntu-latest

name: Nextcloud ${{ matrix.ocp-version }}
name: static-psalm-analysis
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Set up php
uses: shivammathur/setup-php@v2
- name: Set up php8.2
uses: shivammathur/setup-php@6d7209f44a25a59e904b1ee9f3b0c33ab2cd888d # v2
with:
php-version: 7.4
php-version: 8.2
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
coverage: none
ini-file: development
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Install dependencies
run: composer i
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-nextcloud-ocp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branches: ["master", "stable27", "stable26", "stable25", "stable24"]
branches: ["master", "stable28", "stable27", "stable26"]

name: update-nextcloud-ocp-${{ matrix.branches }}

Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
it again at any time.
</description>

<version>1.16.0</version>
<version>1.17.0</version>
<licence>agpl</licence>
<author>Björn Schiessle</author>
<author>Joas Schilling</author>
Expand All @@ -24,7 +24,7 @@
<bugs>https://github.com/nextcloud/survey_client/issues</bugs>

<dependencies>
<nextcloud min-version="28" max-version="28" />
<nextcloud min-version="29" max-version="29" />
</dependencies>

<repair-steps>
Expand Down

0 comments on commit befbd70

Please sign in to comment.