diff --git a/.github/workflows/appstore-build-publish.yml b/.github/workflows/appstore-build-publish.yml index 84da54381c..d5b0f4747b 100644 --- a/.github/workflows/appstore-build-publish.yml +++ b/.github/workflows/appstore-build-publish.yml @@ -9,6 +9,9 @@ on: release: types: [published] +env: + PHP_VERSION: 8.2 + jobs: build_and_publish: runs-on: ubuntu-latest @@ -62,16 +65,10 @@ jobs: if: ${{ steps.versions.outputs.npmVersion }} run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}" - - name: Get php version - id: php-versions - uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1 - with: - filename: ${{ env.APP_NAME }}/appinfo/info.xml - - - name: Set up php ${{ steps.php-versions.outputs.php-min }} - uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2 + - name: Set up php ${{ env.PHP_VERSION }} + uses: shivammathur/setup-php@6d7209f44a25a59e904b1ee9f3b0c33ab2cd888d # v2 with: - php-version: ${{ steps.php-versions.outputs.php-min }} + php-version: ${{ env.PHP_VERSION }} coverage: none env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/behat-mariadb.yml b/.github/workflows/behat-mariadb.yml index 22067142d3..037ebef381 100644 --- a/.github/workflows/behat-mariadb.yml +++ b/.github/workflows/behat-mariadb.yml @@ -10,19 +10,6 @@ concurrency: cancel-in-progress: true jobs: - matrix: - runs-on: ubuntu-latest - outputs: - php-version: ${{ steps.versions.outputs.php-available-list }} - server-max: ${{ steps.versions.outputs.branches-max-list }} - steps: - - name: Checkout app - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - - name: Get version matrix - id: versions - uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1 - changes: runs-on: ubuntu-latest @@ -50,13 +37,13 @@ jobs: behat-mariadb: runs-on: ubuntu-latest - needs: [changes, matrix] + needs: [changes] if: needs.changes.outputs.src != 'false' strategy: matrix: - php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} - server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} + php-versions: ['8.0','8.1','8.2'] + server-versions: [stable29] mariadb-versions: ['10.6', '10.11'] name: MariaDB ${{ matrix.mariadb-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} diff --git a/.github/workflows/behat-mysql.yml b/.github/workflows/behat-mysql.yml index c4b0708439..a9a9be59f1 100644 --- a/.github/workflows/behat-mysql.yml +++ b/.github/workflows/behat-mysql.yml @@ -10,21 +10,6 @@ concurrency: cancel-in-progress: true jobs: - matrix: - runs-on: ubuntu-latest - outputs: - php-version: ${{ steps.versions.outputs.php-available-list }} - server-max: ${{ steps.versions.outputs.branches-max-list }} - steps: - - name: Checkout app - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - - name: Get version matrix - id: versions - uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1 - with: - matrix: '{"mysql-versions": ["8.1"]}' - changes: runs-on: ubuntu-latest @@ -52,13 +37,13 @@ jobs: behat-mysql: runs-on: ubuntu-latest - needs: [changes, matrix] + needs: [changes] if: needs.changes.outputs.src != 'false' strategy: matrix: - php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} - server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} + php-versions: ['8.0','8.1','8.2'] + server-versions: [stable29] mysql-versions: ['8.1'] name: MySQL ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} diff --git a/.github/workflows/behat-pgsql.yml b/.github/workflows/behat-pgsql.yml index 0df0826734..aba47134fb 100644 --- a/.github/workflows/behat-pgsql.yml +++ b/.github/workflows/behat-pgsql.yml @@ -10,19 +10,6 @@ concurrency: cancel-in-progress: true jobs: - matrix: - runs-on: ubuntu-latest - outputs: - php-version: ${{ steps.versions.outputs.php-available-list }} - server-max: ${{ steps.versions.outputs.branches-max-list }} - steps: - - name: Checkout app - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - - name: Get version matrix - id: versions - uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1 - changes: runs-on: ubuntu-latest @@ -50,13 +37,13 @@ jobs: behat-pgsql: runs-on: ubuntu-latest - needs: [changes, matrix] + needs: [changes] if: needs.changes.outputs.src != 'false' strategy: matrix: - php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} - server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} + php-versions: ['8.0','8.1','8.2'] + server-versions: [stable29] name: PostgreSQL PHP ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} diff --git a/.github/workflows/behat-sqlite.yml b/.github/workflows/behat-sqlite.yml index 900ff9fc8e..7443f0b4a8 100644 --- a/.github/workflows/behat-sqlite.yml +++ b/.github/workflows/behat-sqlite.yml @@ -10,19 +10,6 @@ concurrency: cancel-in-progress: true jobs: - matrix: - runs-on: ubuntu-latest - outputs: - php-version: ${{ steps.versions.outputs.php-available-list }} - server-max: ${{ steps.versions.outputs.branches-max-list }} - steps: - - name: Checkout app - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - - name: Get version matrix - id: versions - uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1 - changes: runs-on: ubuntu-latest @@ -50,13 +37,13 @@ jobs: behat-sqlite: runs-on: ubuntu-latest - needs: [changes, matrix] + needs: [changes] if: needs.changes.outputs.src != 'false' strategy: matrix: - php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} - server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} + php-versions: ['8.0','8.1','8.2'] + server-versions: [stable29] name: SQLite PHP ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml index 1ffee78013..497533e8f6 100644 --- a/.github/workflows/lint-php-cs.yml +++ b/.github/workflows/lint-php-cs.yml @@ -24,14 +24,10 @@ jobs: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - name: Get php version - id: versions - uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1 - - - name: Set up php${{ steps.versions.outputs.php-available }} + - name: Set up php8.2 uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2 with: - php-version: ${{ steps.versions.outputs.php-available }} + 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 diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index 284a90efd6..59c737f07b 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'stable29', 'stable28'] + branches: ['stable29'] name: npm-audit-fix-${{ matrix.branches }} diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml index a9165754e1..8fef96ef4a 100644 --- a/.github/workflows/phpunit-mariadb.yml +++ b/.github/workflows/phpunit-mariadb.yml @@ -15,19 +15,6 @@ concurrency: cancel-in-progress: true jobs: - matrix: - runs-on: ubuntu-latest - outputs: - php-version: ${{ steps.versions.outputs.php-available-list }} - server-max: ${{ steps.versions.outputs.branches-max-list }} - steps: - - name: Checkout app - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - - name: Get version matrix - id: versions - uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1 - changes: runs-on: ubuntu-latest @@ -55,13 +42,13 @@ jobs: phpunit-mariadb: runs-on: ubuntu-latest - needs: [changes, matrix] + needs: [changes] if: needs.changes.outputs.src != 'false' strategy: matrix: - php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} - server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} + php-versions: ['8.0','8.1','8.2'] + server-versions: [stable29] mariadb-versions: ['10.6', '10.11'] coverage: ['xdebug'] testsuite: [unit, api] diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml index cdac3aae62..482dd2628d 100644 --- a/.github/workflows/phpunit-mysql.yml +++ b/.github/workflows/phpunit-mysql.yml @@ -15,21 +15,6 @@ concurrency: cancel-in-progress: true jobs: - matrix: - runs-on: ubuntu-latest - outputs: - php-version: ${{ steps.versions.outputs.php-available-list }} - server-max: ${{ steps.versions.outputs.branches-max-list }} - steps: - - name: Checkout app - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - - name: Get version matrix - id: versions - uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1 - with: - matrix: '{"mysql-versions": ["8.1"]}' - changes: runs-on: ubuntu-latest @@ -57,13 +42,13 @@ jobs: phpunit-mysql: runs-on: ubuntu-latest - needs: [changes, matrix] + needs: [changes] if: needs.changes.outputs.src != 'false' strategy: matrix: - php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} - server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} + php-versions: ['8.0','8.1','8.2'] + server-versions: [stable29] mysql-versions: ['8.1'] coverage: ['xdebug'] testsuite: [unit, api] diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml index 17b1dd80c4..716bd4165a 100644 --- a/.github/workflows/phpunit-pgsql.yml +++ b/.github/workflows/phpunit-pgsql.yml @@ -15,19 +15,6 @@ concurrency: cancel-in-progress: true jobs: - matrix: - runs-on: ubuntu-latest - outputs: - php-version: ${{ steps.versions.outputs.php-available-list }} - server-max: ${{ steps.versions.outputs.branches-max-list }} - steps: - - name: Checkout app - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - - name: Get version matrix - id: versions - uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1 - changes: runs-on: ubuntu-latest @@ -55,13 +42,13 @@ jobs: phpunit-pgsql: runs-on: ubuntu-latest - needs: [changes, matrix] + needs: [changes] if: needs.changes.outputs.src != 'false' strategy: matrix: - php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} - server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} + php-versions: ['8.0','8.1','8.2'] + server-versions: [stable29] coverage: ['xdebug'] testsuite: [unit, api] xdebug_mode: ['debug'] diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index aef128dc7f..64c339b672 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -15,19 +15,6 @@ concurrency: cancel-in-progress: true jobs: - matrix: - runs-on: ubuntu-latest - outputs: - php-version: ${{ steps.versions.outputs.php-available-list }} - server-max: ${{ steps.versions.outputs.branches-max-list }} - steps: - - name: Checkout app - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - - name: Get version matrix - id: versions - uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1 - changes: runs-on: ubuntu-latest @@ -55,13 +42,13 @@ jobs: phpunit-sqlite: runs-on: ubuntu-latest - needs: [changes, matrix] + needs: [changes] if: needs.changes.outputs.src != 'false' strategy: matrix: - php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} - server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} + php-versions: ['8.0','8.1','8.2'] + server-versions: [stable29] coverage: ['xdebug'] testsuite: [unit, api] xdebug_mode: ['debug'] @@ -70,7 +57,7 @@ jobs: coverage: xdebug testsuite: default xdebug_mode: coverage - server-versions: master + server-versions: stable29 name: SQLite PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} Testsuite ${{ matrix.testsuite }} diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index b8e12b4e25..e3a573a3da 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -20,14 +20,10 @@ jobs: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - name: Get php version - id: versions - uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1 - - - name: Set up php${{ steps.versions.outputs.php-available }} + - name: Set up php8.2 uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2 with: - php-version: ${{ steps.versions.outputs.php-available }} + 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 diff --git a/.github/workflows/update-nextcloud-ocp-approve-merge.yml b/.github/workflows/update-nextcloud-ocp-approve-merge.yml deleted file mode 100644 index c3f571616f..0000000000 --- a/.github/workflows/update-nextcloud-ocp-approve-merge.yml +++ /dev/null @@ -1,49 +0,0 @@ -# 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: Auto approve nextcloud/ocp - -on: - pull_request_target: - branches: - - main - - master - - stable* - -permissions: - contents: read - -concurrency: - group: update-nextcloud-ocp-approve-merge-${{ github.head_ref || github.run_id }} - cancel-in-progress: true - -jobs: - auto-approve-merge: - if: github.actor == 'nextcloud-command' - runs-on: ubuntu-latest - permissions: - # for hmarr/auto-approve-action to approve PRs - pull-requests: write - # for alexwilson/enable-github-automerge-action to approve PRs - contents: write - - steps: - - uses: mdecoleman/pr-branch-name@bab4c71506bcd299fb350af63bb8e53f2940a599 # v2.0.0 - id: branchname - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - - # GitHub actions bot approve - - uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2 - if: startsWith(steps.branchname.outputs.branch, 'automated/noid/') && endsWith(steps.branchname.outputs.branch, 'update-nextcloud-ocp') - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - - # Enable GitHub auto merge - - name: Auto merge - uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # main - if: startsWith(steps.branchname.outputs.branch, 'automated/noid/') && endsWith(steps.branchname.outputs.branch, 'update-nextcloud-ocp') - with: - github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index b7ed67a295..9026f5b91d 100644 --- a/.github/workflows/update-nextcloud-ocp.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'stable29', 'stable28'] + branches: ['stable29'] name: update-nextcloud-ocp-${{ matrix.branches }} diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml index 73143410d7..acfb371f87 100644 --- a/.github/workflows/update-psalm-baseline.yml +++ b/.github/workflows/update-psalm-baseline.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ["main", "stable29", "stable28"] + branches: ["stable29"] name: update-psalm-baseline-${{ matrix.branches }} diff --git a/package-lock.json b/package-lock.json index fa2ec4c53d..a6aa579a20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "libresign", - "version": "9.0.0-rc9", + "version": "9.0.0-rc10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "libresign", - "version": "9.0.0-rc9", + "version": "9.0.0-rc10", "license": "agpl", "dependencies": { "@fontsource/dancing-script": "^5.0.17", diff --git a/package.json b/package.json index e5fe8aebcb..e34980f6d5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "libresign", "description": "A app for signing documents", - "version": "10.0.0-dev", + "version": "9.0.0-rc10", "license": "agpl", "private": true, "scripts": {