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..697a379da4 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: [stable28] 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..8fc5388cee 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: [stable28] 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..8b66a15be7 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: [stable28] 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..bbf84b0f42 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: [stable28] name: SQLite PHP ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} diff --git a/.github/workflows/behat.yml b/.github/workflows/behat.yml deleted file mode 100644 index 94872e4e24..0000000000 --- a/.github/workflows/behat.yml +++ /dev/null @@ -1,132 +0,0 @@ -name: Behat - -on: - pull_request: - paths: - - '.github/workflows/**' - - 'appinfo/**' - - 'lib/**' - - 'templates/**' - - 'tests/**' - - 'vendor/**' - - 'vendor-bin/**' - - '.php-cs-fixer.dist.php' - - 'composer.json' - - 'composer.lock' - push: - branches: - - main - - stable* - -env: - APP_NAME: libresign - -jobs: - behat: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - php-versions: ['8.0', '8.1', '8.2'] - databases: ['sqlite', 'mysql', 'pgsql'] - server-versions: ['stable28'] - - name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} - - services: - postgres: - image: postgres:15 - ports: - - 4445: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 - mysql: - image: ghcr.io/nextcloud/continuous-integration-mariadb-10.6:latest - ports: - - 4444:3306/tcp - env: - MYSQL_ROOT_PASSWORD: rootpassword - options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5 - mailhog: - image: mailhog/mailhog - ports: - - 8025:8025/tcp - - 1025:1025/tcp - - steps: - - name: Checkout server - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - 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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - path: apps/${{ env.APP_NAME }} - - - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # 2.30.0 - with: - php-version: ${{ matrix.php-versions }} - tools: phpunit - extensions: mbstring, iconv, fileinfo, intl, imagick, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql, - coverage: none - - - name: Set up dependencies - working-directory: apps/${{ env.APP_NAME }} - run: | - composer install --no-dev - composer --working-dir=tests/integration install - - - name: Install Ghostscript - run: | - sudo apt-get update - sudo apt-get install ghostscript - - - name: Set up Nextcloud - run: | - if [ "${{ matrix.databases }}" = "mysql" ]; then - export DB_PORT=4444 - elif [ "${{ matrix.databases }}" = "pgsql" ]; then - export DB_PORT=4445 - fi - sudo echo "127.0.0.1 mailhog" | sudo tee -a /etc/hosts - 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=admin - ./occ app:enable ${{ env.APP_NAME }} - git clone --depth 1 -b ${{ matrix.server-versions }} https://github.com/nextcloud/notifications apps/notifications - ./occ app:enable --force notifications - git clone --depth 1 -b ${{ matrix.server-versions }} https://github.com/nextcloud/activity apps/activity - ./occ app:enable --force activity - ./occ config:system:set mail_smtpport --value 1025 --type integer - ./occ config:system:set mail_smtphost --value mailhog - ./occ config:system:set allow_local_remote_servers --value true --type boolean - - - name: Run behat - working-directory: apps/${{ env.APP_NAME }}/tests/integration - env: - BEHAT_ROOT_DIR: ../../../../ - run: | - export BEHAT_RUN_AS=runner - export BEHAT_VERBOSE="$RUNNER_DEBUG" - vendor/bin/behat -f junit -f pretty --colors 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..d5ad1c0090 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: ['stable28'] name: npm-audit-fix-${{ matrix.branches }} diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml index a9165754e1..5bfceb75bb 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: [stable28] 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..88afdd74a0 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: [stable28] 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..c7758c22af 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: [stable28] coverage: ['xdebug'] testsuite: [unit, api] xdebug_mode: ['debug'] diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index aef128dc7f..ad912d1aa5 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: [stable28] 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: stable28 name: SQLite PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} Testsuite ${{ matrix.testsuite }} diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml deleted file mode 100644 index a53b1727e6..0000000000 --- a/.github/workflows/phpunit.yml +++ /dev/null @@ -1,138 +0,0 @@ -name: PHPUnit - -on: - pull_request: - paths: - - '.github/workflows/**' - - 'appinfo/**' - - 'lib/**' - - 'templates/**' - - 'tests/**' - - 'vendor/**' - - 'vendor-bin/**' - - '.php-cs-fixer.dist.php' - - 'composer.json' - - 'composer.lock' - - push: - branches: - - main - - master - - stable* - -env: - APP_NAME: libresign - -jobs: - phpunit: - runs-on: ubuntu-latest - strategy: - # do not stop on another job's failure - fail-fast: false - matrix: - php-versions: ['8.0', '8.1', '8.2'] - databases: ['sqlite'] - coverage: ['xdebug'] - testsuite: [unit, api] - xdebug_mode: ['debug'] - server-versions: ['stable28'] - include: - - php-versions: '8.0' - databases: sqlite - coverage: xdebug - testsuite: default - xdebug_mode: debug - server-versions: stable28 - name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}-${{ matrix.testsuite }} - - steps: - - name: Checkout server - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - 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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - path: apps/${{ env.APP_NAME }} - - - name: Checkout site - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - repository: libresign/libresign.github.io - path: 'apps/${{ env.APP_NAME }}/build/site' - - - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-versions }} - coverage: ${{ matrix.coverage }} - tools: phpunit - extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite - - - name: Set up PHP dependencies - working-directory: apps/${{ env.APP_NAME }} - run: composer i - - name: Prevent Nextcloud OCP outdated - working-directory: apps/${{ env.APP_NAME }} - run: make updateocp - - - 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 - - name: Enable app - run: | - ./occ app:enable ${{ env.APP_NAME }} - - name: Start built in server - run: | - php -S localhost:8080 & - - name: Set up dependencies apps - run: | - ./occ app:install --force --keep-disabled twofactor_gateway - ./occ app:enable --force twofactor_gateway - - name: PHPUnit - working-directory: apps/${{ env.APP_NAME }} - env: - XDEBUG_MODE: ${{ matrix.xdebug_mode }} - run: ./vendor/bin/phpunit -c phpunit.xml --testsuite ${{ matrix.testsuite }} - upload-coverage: - needs: phpunit - runs-on: ubuntu-latest - steps: - - name: Upload coverage results to Coveralls - working-directory: apps/${{ env.APP_NAME }} - if: matrix.xdebug_mode == 'coverage' - env: - COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COVERALLS_PARALLEL: true - COVERALLS_FLAG_NAME: php-${{ matrix.php-versions }} - run: vendor/bin/php-coveralls --coverage_clover=build/logs/clover.xml --json_path=build/logs/coveralls-upload.json -v - finish-coverage: - needs: upload-coverage - runs-on: ubuntu-latest - steps: - - name: Let Coveralls know that all tests have finished - uses: coverallsapp/github-action@v2.0.0 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - parallel-finished: true 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 }}